lkml.org 
[lkml]   [2013]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch net-next V6 06/15] bridge: remove usage of netdev_set_master()
    Date
    Signed-off-by: Jiri Pirko <jiri@resnulli.us>
    ---
    net/bridge/br_if.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
    index 1edd71d..2148d47 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:
    --
    1.8.0


    \
     
     \ /
      Last update: 2013-01-04 10:41    [W:5.380 / U:1.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site