浏览代码

[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>
Patrick McHardy 18 年之前
父节点
当前提交
035832a280
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/core/dev.c

+ 2 - 2
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);
 		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)
 		if ((q = dev->qdisc_ingress) != NULL)
 			result = q->enqueue(skb, q);
 			result = q->enqueue(skb, q);
-		spin_unlock(&dev->ingress_lock);
+		spin_unlock(&dev->queue_lock);
 
 
 	}
 	}