diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 15:49:13 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 15:49:13 (GMT) |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /include/net/sch_generic.h | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
| download | linux-fsl-qoriq-4e4f62bf7396fca48efe61513640ee399a6046e3.tar.xz | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 03ca5d8..433604b 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -313,12 +313,24 @@ extern void qdisc_calculate_pkt_len(struct sk_buff *skb, extern void tcf_destroy(struct tcf_proto *tp); extern void tcf_destroy_chain(struct tcf_proto **fl); -/* Reset all TX qdiscs of a device. */ +/* Reset all TX qdiscs greater then index of a device. */ +static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i) +{ + struct Qdisc *qdisc; + + for (; i < dev->num_tx_queues; i++) { + qdisc = netdev_get_tx_queue(dev, i)->qdisc; + if (qdisc) { + spin_lock_bh(qdisc_lock(qdisc)); + qdisc_reset(qdisc); + spin_unlock_bh(qdisc_lock(qdisc)); + } + } +} + static inline void qdisc_reset_all_tx(struct net_device *dev) { - unsigned int i; - for (i = 0; i < dev->num_tx_queues; i++) - qdisc_reset(netdev_get_tx_queue(dev, i)->qdisc); + qdisc_reset_all_tx_gt(dev, 0); } /* Are all TX queues of the device empty? */ |