leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock

Browse Source 
When calling qdisc_reset() the qdisc lock needs to be held.  In
this case there is at least one driver i4l which is using this
without holding the lock.  Add the locking here.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
John Fastabend 2010-07-01 13:21:35 +00:00 committed by David S. Miller
parent 7ae80abdba
commit 4ef6acff83
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/sch_generic.h
View File

@ -317,8 +317,16 @@ extern void tcf_destroy_chain(struct tcf_proto **fl);
static inline void qdisc_reset_all_tx(struct net_device *dev) static inline void qdisc_reset_all_tx(struct net_device *dev)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < dev->num_tx_queues; i++) struct Qdisc *qdisc;
qdisc_reset(netdev_get_tx_queue(dev, i)->qdisc);
for (i = 0; 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));
}
}
} }
/* Are all TX queues of the device empty? */ /* Are all TX queues of the device empty? */