Skip to content

Commit

Permalink
openvswitch: introduce rtnl ops stub
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jul 1, 2014
1 parent b0ab2fa commit 5b9e7e1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
9 changes: 8 additions & 1 deletion net/openvswitch/datapath.c
Original file line number Diff line number Diff line change
Expand Up @@ -2054,10 +2054,14 @@ static int __init dp_init(void)

pr_info("Open vSwitch switching datapath\n");

err = ovs_flow_init();
err = ovs_internal_dev_rtnl_link_register();
if (err)
goto error;

err = ovs_flow_init();
if (err)
goto error_unreg_rtnl_link;

err = ovs_vport_init();
if (err)
goto error_flow_exit;
Expand All @@ -2084,6 +2088,8 @@ static int __init dp_init(void)
ovs_vport_exit();
error_flow_exit:
ovs_flow_exit();
error_unreg_rtnl_link:
ovs_internal_dev_rtnl_link_unregister();
error:
return err;
}
Expand All @@ -2096,6 +2102,7 @@ static void dp_cleanup(void)
rcu_barrier();
ovs_vport_exit();
ovs_flow_exit();
ovs_internal_dev_rtnl_link_unregister();
}

module_init(dp_init);
Expand Down
16 changes: 16 additions & 0 deletions net/openvswitch/vport-internal_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <net/dst.h>
#include <net/xfrm.h>
#include <net/rtnetlink.h>

#include "datapath.h"
#include "vport-internal_dev.h"
Expand Down Expand Up @@ -121,6 +122,10 @@ static const struct net_device_ops internal_dev_netdev_ops = {
.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)
{
ether_setup(netdev);
Expand All @@ -131,6 +136,7 @@ static void do_setup(struct net_device *netdev)
netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
netdev->destructor = internal_dev_destructor;
netdev->ethtool_ops = &internal_dev_ethtool_ops;
netdev->rtnl_link_ops = &internal_dev_link_ops;
netdev->tx_queue_len = 0;

netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
Expand Down Expand Up @@ -248,3 +254,13 @@ struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)

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 changes: 2 additions & 0 deletions net/openvswitch/vport-internal_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@

int ovs_is_internal_dev(const 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 */

0 comments on commit 5b9e7e1

Please sign in to comment.