Used by STT.

Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
 lib/netdev-vport.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index cdd4fa2..8b41201 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -812,11 +812,11 @@ get_stats(const struct netdev *netdev, struct 
netdev_stats *stats)
 }
 
 
-#define VPORT_FUNCTIONS(GET_CONFIG, SET_CONFIG,             \
+#define VPORT_FUNCTIONS(INIT, GET_CONFIG, SET_CONFIG,       \
                         GET_TUNNEL_CONFIG, GET_STATUS,      \
                         BUILD_HEADER,                       \
                         PUSH_HEADER, POP_HEADER)            \
-    NULL,                                                   \
+    INIT,                                                   \
     netdev_vport_run,                                       \
     netdev_vport_wait,                                      \
                                                             \
@@ -882,9 +882,10 @@ get_stats(const struct netdev *netdev, struct netdev_stats 
*stats)
     NULL,                   /* rx_drain */
 
 
-#define TUNNEL_CLASS(NAME, DPIF_PORT, BUILD_HEADER, PUSH_HEADER, POP_HEADER)   
\
+#define TUNNEL_CLASS(NAME, DPIF_PORT, INIT, BUILD_HEADER, PUSH_HEADER, 
POP_HEADER)   \
     { DPIF_PORT,                                                               
\
-        { NAME, VPORT_FUNCTIONS(get_tunnel_config,                             
\
+        { NAME, VPORT_FUNCTIONS(INIT,                                          
\
+                                get_tunnel_config,                             
\
                                 set_tunnel_config,                             
\
                                 get_netdev_tunnel_config,                      
\
                                 tunnel_get_status,                             
\
@@ -896,18 +897,18 @@ netdev_vport_tunnel_register(void)
     /* The name of the dpif_port should be short enough to accomodate adding
      * a port number to the end if one is necessary. */
     static const struct vport_class vport_classes[] = {
-        TUNNEL_CLASS("geneve", "genev_sys", netdev_geneve_build_header,
+        TUNNEL_CLASS("geneve", "genev_sys", NULL, netdev_geneve_build_header,
                                             push_udp_header,
                                             netdev_geneve_pop_header),
-        TUNNEL_CLASS("gre", "gre_sys", netdev_gre_build_header,
+        TUNNEL_CLASS("gre", "gre_sys", NULL, netdev_gre_build_header,
                                        netdev_gre_push_header,
                                        netdev_gre_pop_header),
-        TUNNEL_CLASS("ipsec_gre", "gre_sys", NULL, NULL, NULL),
-        TUNNEL_CLASS("vxlan", "vxlan_sys", netdev_vxlan_build_header,
+        TUNNEL_CLASS("ipsec_gre", "gre_sys", NULL, NULL, NULL, NULL),
+        TUNNEL_CLASS("vxlan", "vxlan_sys", NULL, netdev_vxlan_build_header,
                                            push_udp_header,
                                            netdev_vxlan_pop_header),
-        TUNNEL_CLASS("lisp", "lisp_sys", NULL, NULL, NULL),
-        TUNNEL_CLASS("stt", "stt_sys", NULL, NULL, NULL),
+        TUNNEL_CLASS("lisp", "lisp_sys", NULL, NULL, NULL, NULL),
+        TUNNEL_CLASS("stt", "stt_sys", NULL, NULL, NULL, NULL),
     };
     static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
 
@@ -930,7 +931,8 @@ netdev_vport_patch_register(void)
 {
     static const struct vport_class patch_class =
         { NULL,
-            { "patch", VPORT_FUNCTIONS(get_patch_config,
+            { "patch", VPORT_FUNCTIONS(NULL,
+                                       get_patch_config,
                                        set_patch_config,
                                        NULL,
                                        NULL, NULL, NULL, NULL) }};
-- 
1.8.3.1

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to