diff --git a/[refs] b/[refs] index ca7ae1d4e77f..e3f142bfc165 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b318e0e4ef4e85812c25afa19f75addccc834cd4 +refs/heads/master: d8b2a4d21e0b37b9669b202867bfef19f68f786a diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 9549417250bb..6cfc1238c4a6 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1071,8 +1071,6 @@ int dev_close(struct net_device *dev) */ call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); - dev_deactivate(dev); - clear_bit(__LINK_STATE_START, &dev->state); /* Synchronize to scheduled poll. We cannot touch poll list, @@ -1083,6 +1081,8 @@ int dev_close(struct net_device *dev) */ smp_mb__after_clear_bit(); /* Commit netif_running(). */ + dev_deactivate(dev); + /* * Call the device specific close. This cannot fail. * Only if device is UP