[NET_SCHED]: ingress: switch back to using ingress_lock
Switch ingress queueing back to use ingress_lock. qdisc_lock_tree now locks both the ingress and egress qdiscs on the device. All changes to data that might be used on both ingress and egress needs to be protected by using qdisc_lock_tree instead of manually taking dev->queue_lock. Additionally the qdisc stats_lock needs to be initialized to ingress_lock for ingress qdiscs. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0463d4ae25
commit
fd44de7cc1
@@ -89,9 +89,9 @@ static __inline__ int route4_fastmap_hash(u32 id, int iif)
|
||||
static inline
|
||||
void route4_reset_fastmap(struct net_device *dev, struct route4_head *head, u32 id)
|
||||
{
|
||||
spin_lock_bh(&dev->queue_lock);
|
||||
qdisc_lock_tree(dev);
|
||||
memset(head->fastmap, 0, sizeof(head->fastmap));
|
||||
spin_unlock_bh(&dev->queue_lock);
|
||||
qdisc_unlock_tree(dev);
|
||||
}
|
||||
|
||||
static inline void
|
||||
|
Reference in New Issue
Block a user