diff options
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9549417250b..6cfc1238c4a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1071,8 +1071,6 @@ int dev_close(struct net_device *dev) | |||
1071 | */ | 1071 | */ |
1072 | call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); | 1072 | call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); |
1073 | 1073 | ||
1074 | dev_deactivate(dev); | ||
1075 | |||
1076 | clear_bit(__LINK_STATE_START, &dev->state); | 1074 | clear_bit(__LINK_STATE_START, &dev->state); |
1077 | 1075 | ||
1078 | /* Synchronize to scheduled poll. We cannot touch poll list, | 1076 | /* Synchronize to scheduled poll. We cannot touch poll list, |
@@ -1083,6 +1081,8 @@ int dev_close(struct net_device *dev) | |||
1083 | */ | 1081 | */ |
1084 | smp_mb__after_clear_bit(); /* Commit netif_running(). */ | 1082 | smp_mb__after_clear_bit(); /* Commit netif_running(). */ |
1085 | 1083 | ||
1084 | dev_deactivate(dev); | ||
1085 | |||
1086 | /* | 1086 | /* |
1087 | * Call the device specific close. This cannot fail. | 1087 | * Call the device specific close. This cannot fail. |
1088 | * Only if device is UP | 1088 | * Only if device is UP |