diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-03 22:48:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-04 13:31:50 -0800 |
| commit | 74fdd93fbcc16522406f65c564ea104490ad4908 (patch) | |
| tree | 6355c2f7e908e5896e8b95dcd5dbb2d96d8c8211 | |
| parent | b1cc9850cd92856196a45e75e97e9d6c2c0b6dc3 (diff) | |
| download | linux-74fdd93fbcc16522406f65c564ea104490ad4908.tar.bz2 | |
bridge: remove usage of netdev_set_master()
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 1edd71d44a4c..2148d474a04f 100644 --- 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: |