diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-09 02:11:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-09 02:11:25 -0400 |
commit | 86d804e10a37cd86f16bf72386c37e843a98a74b (patch) | |
tree | 04483a937f11c752aea998298a27fc79e6851b2d /net/sched/sch_api.c | |
parent | 970565bbad0c7b98db0d14131a69e5a0f4445d49 (diff) |
netdev: Make netif_schedule() routines work with netdev_queue objects.
Only plain netif_schedule() remains taking a net_device, mostly as a
compatability item while we transition the rest of these interfaces.
Everything else calls netif_schedule_queue() or __netif_schedule(),
both of which take a netdev_queue pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e73bd68aa7ae..95873f8dd37c 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -282,11 +282,11 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
282 | { | 282 | { |
283 | struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog, | 283 | struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog, |
284 | timer); | 284 | timer); |
285 | struct net_device *dev = qdisc_dev(wd->qdisc); | 285 | struct netdev_queue *txq = wd->qdisc->dev_queue; |
286 | 286 | ||
287 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 287 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; |
288 | smp_wmb(); | 288 | smp_wmb(); |
289 | netif_schedule(dev); | 289 | netif_schedule_queue(txq); |
290 | 290 | ||
291 | return HRTIMER_NORESTART; | 291 | return HRTIMER_NORESTART; |
292 | } | 292 | } |