diff options
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_generic.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 5f5efe4e6072..23a8e6141a00 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -270,8 +270,6 @@ static void dev_watchdog_down(struct net_device *dev) | |||
270 | void netif_carrier_on(struct net_device *dev) | 270 | void netif_carrier_on(struct net_device *dev) |
271 | { | 271 | { |
272 | if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) { | 272 | if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) { |
273 | if (dev->reg_state == NETREG_UNINITIALIZED) | ||
274 | return; | ||
275 | linkwatch_fire_event(dev); | 273 | linkwatch_fire_event(dev); |
276 | if (netif_running(dev)) | 274 | if (netif_running(dev)) |
277 | __netdev_watchdog_up(dev); | 275 | __netdev_watchdog_up(dev); |
@@ -288,8 +286,6 @@ EXPORT_SYMBOL(netif_carrier_on); | |||
288 | void netif_carrier_off(struct net_device *dev) | 286 | void netif_carrier_off(struct net_device *dev) |
289 | { | 287 | { |
290 | if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) { | 288 | if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) { |
291 | if (dev->reg_state == NETREG_UNINITIALIZED) | ||
292 | return; | ||
293 | linkwatch_fire_event(dev); | 289 | linkwatch_fire_event(dev); |
294 | } | 290 | } |
295 | } | 291 | } |