lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkt_sched: Make qdisc_run take a netdev_queue.

Browse Source 
This allows us to use this calling convention all the way down into
qdisc_restart().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2008-07-08 23:12:38 -07:00
parent 86d804e10a
commit eb6aafe3f8
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/core/dev.c
View File

@ -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);