diff options
| -rw-r--r-- | net/sched/sch_api.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index d92ea26982..4fd0beca94 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -278,11 +278,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
| 278 | 278 | ||
| 279 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 279 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; |
| 280 | smp_wmb(); | 280 | smp_wmb(); |
| 281 | if (spin_trylock(&dev->queue_lock)) { | 281 | netif_schedule(dev); |
| 282 | qdisc_run(dev); | ||
| 283 | spin_unlock(&dev->queue_lock); | ||
| 284 | } else | ||
| 285 | netif_schedule(dev); | ||
| 286 | 282 | ||
| 287 | return HRTIMER_NORESTART; | 283 | return HRTIMER_NORESTART; |
| 288 | } | 284 | } |
