aboutsummaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 23:12:38 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-08 23:12:38 -0700
commiteb6aafe3f843cb0e939546c03540a3b4911b6964 (patch)
tree550cfba4baadcb64f98ce6e77fe6f9b44b5bb142 /net/core
parent86d804e10a37cd86f16bf72386c37e843a98a74b (diff)
pkt_sched: Make qdisc_run take a netdev_queue.
This allows us to use this calling convention all the way down into qdisc_restart(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0dc888ad421..0218b0b9be8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1734,7 +1734,7 @@ gso:
/* reset queue_mapping to zero */
skb_set_queue_mapping(skb, 0);
rc = q->enqueue(skb, q);
- qdisc_run(dev);
+ qdisc_run(txq);
spin_unlock(&txq->lock);
rc = rc == NET_XMIT_BYPASS ? NET_XMIT_SUCCESS : rc;
@@ -1930,7 +1930,7 @@ static void net_tx_action(struct softirq_action *h)
clear_bit(__LINK_STATE_SCHED, &dev->state);
if (spin_trylock(&txq->lock)) {
- qdisc_run(dev);
+ qdisc_run(txq);
spin_unlock(&txq->lock);
} else {
netif_schedule_queue(txq);