bridge: remove usage of netdev_set_master()

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 1edd71d..2148d47 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p)
        netdev_rx_handler_unregister(dev);
        synchronize_net();
 
-       netdev_set_master(dev, NULL);
+       netdev_upper_dev_unlink(dev, br->dev);
 
        br_multicast_del_port(p);
 
@@ -364,7 +364,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL))))
                goto err3;
 
-       err = netdev_set_master(dev, br->dev);
+       err = netdev_master_upper_dev_link(dev, br->dev);
        if (err)
                goto err4;
 
@@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        return 0;
 
 err5:
-       netdev_set_master(dev, NULL);
+       netdev_upper_dev_unlink(dev, br->dev);
 err4:
        br_netpoll_disable(p);
 err3: