bridge: implement [add/del]_slave ops

add possibility to addif/delif via rtnetlink

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 556443566e9c417bbb07da73d0cafd750d11de73..1461b19efd38255292f695c496ad5258222be028 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -297,6 +297,21 @@ void br_netpoll_disable(struct net_bridge_port *p)
 
 #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 = {
        .get_drvinfo    = br_getinfo,
        .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_poll_controller     = br_poll_controller,
 #endif
+       .ndo_add_slave           = br_add_slave,
+       .ndo_del_slave           = br_del_slave,
 };
 
 static void br_dev_free(struct net_device *dev)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2a6801d8b728ddfc185b9032b5262a162593d23b..dce8f0009a12dc75d3e51327216186c430b3c27d 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -148,6 +148,8 @@ static void del_nbp(struct net_bridge_port *p)
 
        netdev_rx_handler_unregister(dev);
 
+       netdev_set_master(dev, NULL);
+
        br_multicast_del_port(p);
 
        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))))
                goto err3;
 
-       err = netdev_rx_handler_register(dev, br_handle_frame, p);
+       err = netdev_set_master(dev, br->dev);
        if (err)
                goto err3;
 
+       err = netdev_rx_handler_register(dev, br_handle_frame, p);
+       if (err)
+               goto err4;
+
        dev->priv_flags |= IFF_BRIDGE_PORT;
 
        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);
 
        return 0;
+
+err4:
+       netdev_set_master(dev, NULL);
 err3:
        sysfs_remove_link(br->ifobj, p->dev->name);
 err2: