aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/datapath.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-06-26 03:58:26 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-01 17:40:17 -0400
commit5b9e7e1607956e2454ccbd94ccf5631309ade054 (patch)
tree0b0d12f60c183d72e4d34ce8c4cc9dd22de32f0c /net/openvswitch/datapath.c
parentb0ab2fabb5b91da99c189db02e91ae10bc8355c5 (diff)
openvswitch: introduce rtnl ops stub
This stub now allows userspace to see IFLA_INFO_KIND for ovs master and IFLA_INFO_SLAVE_KIND for slave. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r--net/openvswitch/datapath.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 0d407bca81e3..fe95b6c224a7 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -2054,10 +2054,14 @@ static int __init dp_init(void)
2054 2054
2055 pr_info("Open vSwitch switching datapath\n"); 2055 pr_info("Open vSwitch switching datapath\n");
2056 2056
2057 err = ovs_flow_init(); 2057 err = ovs_internal_dev_rtnl_link_register();
2058 if (err) 2058 if (err)
2059 goto error; 2059 goto error;
2060 2060
2061 err = ovs_flow_init();
2062 if (err)
2063 goto error_unreg_rtnl_link;
2064
2061 err = ovs_vport_init(); 2065 err = ovs_vport_init();
2062 if (err) 2066 if (err)
2063 goto error_flow_exit; 2067 goto error_flow_exit;
@@ -2084,6 +2088,8 @@ error_vport_exit:
2084 ovs_vport_exit(); 2088 ovs_vport_exit();
2085error_flow_exit: 2089error_flow_exit:
2086 ovs_flow_exit(); 2090 ovs_flow_exit();
2091error_unreg_rtnl_link:
2092 ovs_internal_dev_rtnl_link_unregister();
2087error: 2093error:
2088 return err; 2094 return err;
2089} 2095}
@@ -2096,6 +2102,7 @@ static void dp_cleanup(void)
2096 rcu_barrier(); 2102 rcu_barrier();
2097 ovs_vport_exit(); 2103 ovs_vport_exit();
2098 ovs_flow_exit(); 2104 ovs_flow_exit();
2105 ovs_internal_dev_rtnl_link_unregister();
2099} 2106}
2100 2107
2101module_init(dp_init); 2108module_init(dp_init);