diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-28 21:58:20 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-03-28 21:58:20 +0200 |
| commit | b50f212883c001575f2aee338f7142bba0d5e60f (patch) | |
| tree | 6e7eaf08b541aa8c7d69dee06e4fdbba0d8e2d27 /net | |
| parent | 93e6aebaa0fb7db45b9f36ce7090024b5de02682 (diff) | |
[NET_SCHED]: Fix ingress locking
Ingress queueing uses a seperate lock for serializing enqueue operations,
but fails to properly protect itself against concurrent changes to the
qdisc tree. Use queue_lock for now since the real fix it quite intrusive.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index caa8cbb0e0f..23cdd8b0575 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1566,10 +1566,10 @@ static int ing_filter(struct sk_buff *skb) skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_INGRESS); - spin_lock(&dev->ingress_lock); + spin_lock(&dev->queue_lock); if ((q = dev->qdisc_ingress) != NULL) result = q->enqueue(skb, q); - spin_unlock(&dev->ingress_lock); + spin_unlock(&dev->queue_lock); } |