lkml.org 
[lkml]   [2012]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch net-next 15/16] net: remove usage of dev->master
    Date
    Signed-off-by: Jiri Pirko <jiri@resnulli.us>
    ---
    net/core/dev.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/core/dev.c b/net/core/dev.c
    index c0f9adb..8977404 100644
    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -5461,8 +5461,8 @@ static void rollback_registered_many(struct list_head *head)
    if (dev->netdev_ops->ndo_uninit)
    dev->netdev_ops->ndo_uninit(dev);

    - /* Notifier chain MUST detach us from master device. */
    - WARN_ON(dev->master);
    + /* Notifier chain MUST detach us all upper devices. */
    + WARN_ON(netdev_has_any_upper_dev(dev));

    /* Remove entries from kobject tree */
    netdev_unregister_kobject(dev);
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-08-13 18:04    [W:0.027 / U:121.664 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site