luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: implement [add/del]_slave ops

Browse Source 
add possibility to addif/delif via rtnetlink

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2011-02-13 09:33:42 +00:00 committed by David S. Miller
parent 9232ecca3e
commit afc6151a78
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/bridge/br_device.c
View File

@ -297,6 +297,21 @@ void br_netpoll_disable(struct net_bridge_port *p)
#endif #endif
static int br_add_slave(struct net_device *dev, struct net_device *slave_dev)
{
struct net_bridge *br = netdev_priv(dev);
return br_add_if(br, slave_dev);
}
static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)
{
struct net_bridge *br = netdev_priv(dev);
return br_del_if(br, slave_dev);
}
static const struct ethtool_ops br_ethtool_ops = { static const struct ethtool_ops br_ethtool_ops = {
.get_drvinfo = br_getinfo, .get_drvinfo = br_getinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
@ -326,6 +341,8 @@ static const struct net_device_ops br_netdev_ops = {
.ndo_netpoll_cleanup = br_netpoll_cleanup, .ndo_netpoll_cleanup = br_netpoll_cleanup,
.ndo_poll_controller = br_poll_controller, .ndo_poll_controller = br_poll_controller,
#endif #endif
.ndo_add_slave = br_add_slave,
.ndo_del_slave = br_del_slave,
}; };
static void br_dev_free(struct net_device *dev) static void br_dev_free(struct net_device *dev)

11
net/bridge/br_if.c
View File

@ -148,6 +148,8 @@ static void del_nbp(struct net_bridge_port *p)
netdev_rx_handler_unregister(dev); netdev_rx_handler_unregister(dev);
netdev_set_master(dev, NULL);
br_multicast_del_port(p); br_multicast_del_port(p);
kobject_uevent(&p->kobj, KOBJ_REMOVE); kobject_uevent(&p->kobj, KOBJ_REMOVE);
@ -429,10 +431,14 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
if (br_netpoll_info(br) && ((err = br_netpoll_enable(p)))) if (br_netpoll_info(br) && ((err = br_netpoll_enable(p))))
goto err3; goto err3;
err = netdev_rx_handler_register(dev, br_handle_frame, p); err = netdev_set_master(dev, br->dev);
if (err) if (err)
goto err3; goto err3;
err = netdev_rx_handler_register(dev, br_handle_frame, p);
if (err)
goto err4;
dev->priv_flags |= IFF_BRIDGE_PORT; dev->priv_flags |= IFF_BRIDGE_PORT;
dev_disable_lro(dev); dev_disable_lro(dev);
@ -455,6 +461,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
kobject_uevent(&p->kobj, KOBJ_ADD); kobject_uevent(&p->kobj, KOBJ_ADD);
return 0; return 0;
err4:
netdev_set_master(dev, NULL);
err3: err3:
sysfs_remove_link(br->ifobj, p->dev->name); sysfs_remove_link(br->ifobj, p->dev->name);
err2: err2: