diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-24 22:13:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-03-25 18:48:12 -0700 |
| commit | 035832a2806408ff209a0cb94bd64ea7dcf4d222 (patch) | |
| tree | e8c545d1689dc655690d981d4be113c3ae26b8bc /net | |
| parent | d3fa76ee6b4a8dd0efda4e78e96f5b19533b3dea (diff) | |
| download | op-kernel-dev-035832a2806408ff209a0cb94bd64ea7dcf4d222.zip op-kernel-dev-035832a2806408ff209a0cb94bd64ea7dcf4d222.tar.gz | |
[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>
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 cf71614..5984b55 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1750,10 +1750,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); } |
