UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Pirko 2014-06-26 09:58:26 +02:00 committed by David S. Miller
parent b0ab2fabb5
commit 5b9e7e1607
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/openvswitch/datapath.c
View File

@ -2054,10 +2054,14 @@ static int __init dp_init(void)
pr_info("Open vSwitch switching datapath\n"); pr_info("Open vSwitch switching datapath\n");
err = ovs_flow_init(); err = ovs_internal_dev_rtnl_link_register();
if (err) if (err)
goto error; goto error;
err = ovs_flow_init();
if (err)
goto error_unreg_rtnl_link;
err = ovs_vport_init(); err = ovs_vport_init();
if (err) if (err)
goto error_flow_exit; goto error_flow_exit;
@ -2084,6 +2088,8 @@ error_vport_exit:
ovs_vport_exit(); ovs_vport_exit();
error_flow_exit: error_flow_exit:
ovs_flow_exit(); ovs_flow_exit();
error_unreg_rtnl_link:
ovs_internal_dev_rtnl_link_unregister();
error: error:
return err; return err;
} }
@ -2096,6 +2102,7 @@ static void dp_cleanup(void)
rcu_barrier(); rcu_barrier();
ovs_vport_exit(); ovs_vport_exit();
ovs_flow_exit(); ovs_flow_exit();
ovs_internal_dev_rtnl_link_unregister();
} }
module_init(dp_init); module_init(dp_init);

16
net/openvswitch/vport-internal_dev.c
View File

@ -26,6 +26,7 @@
#include <net/dst.h> #include <net/dst.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/rtnetlink.h>
#include "datapath.h" #include "datapath.h"
#include "vport-internal_dev.h" #include "vport-internal_dev.h"
@ -121,6 +122,10 @@ static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_get_stats64 = internal_dev_get_stats, .ndo_get_stats64 = internal_dev_get_stats,
}; };
static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
.kind = "openvswitch",
};
static void do_setup(struct net_device *netdev) static void do_setup(struct net_device *netdev)
{ {
ether_setup(netdev); ether_setup(netdev);
@ -131,6 +136,7 @@ static void do_setup(struct net_device *netdev)
netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
netdev->destructor = internal_dev_destructor; netdev->destructor = internal_dev_destructor;
netdev->ethtool_ops = &internal_dev_ethtool_ops; netdev->ethtool_ops = &internal_dev_ethtool_ops;
netdev->rtnl_link_ops = &internal_dev_link_ops;
netdev->tx_queue_len = 0; netdev->tx_queue_len = 0;
netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
@ -248,3 +254,13 @@ struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)
return internal_dev_priv(netdev)->vport; return internal_dev_priv(netdev)->vport;
} }
int ovs_internal_dev_rtnl_link_register(void)
{
return rtnl_link_register(&internal_dev_link_ops);
}
void ovs_internal_dev_rtnl_link_unregister(void)
{
rtnl_link_unregister(&internal_dev_link_ops);
}

2
net/openvswitch/vport-internal_dev.h
View File

@ -24,5 +24,7 @@
int ovs_is_internal_dev(const struct net_device *); int ovs_is_internal_dev(const struct net_device *);
struct vport *ovs_internal_dev_get_vport(struct net_device *); struct vport *ovs_internal_dev_get_vport(struct net_device *);
int ovs_internal_dev_rtnl_link_register(void);
void ovs_internal_dev_rtnl_link_unregister(void);
#endif /* vport-internal_dev.h */ #endif /* vport-internal_dev.h */