aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_ingress.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_ingress.c')
-rw-r--r--net/sched/sch_ingress.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 1fb60aba1e6c..ad22dc6af22a 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -248,16 +248,11 @@ ing_hook(unsigned int hook, struct sk_buff **pskb,
248 skb->dev ? (*pskb)->dev->name : "(no dev)", 248 skb->dev ? (*pskb)->dev->name : "(no dev)",
249 skb->len); 249 skb->len);
250 250
251/*
252revisit later: Use a private since lock dev->queue_lock is also
253used on the egress (might slow things for an iota)
254*/
255
256 if (dev->qdisc_ingress) { 251 if (dev->qdisc_ingress) {
257 spin_lock(&dev->queue_lock); 252 spin_lock(&dev->ingress_lock);
258 if ((q = dev->qdisc_ingress) != NULL) 253 if ((q = dev->qdisc_ingress) != NULL)
259 fwres = q->enqueue(skb, q); 254 fwres = q->enqueue(skb, q);
260 spin_unlock(&dev->queue_lock); 255 spin_unlock(&dev->ingress_lock);
261 } 256 }
262 257
263 return fwres; 258 return fwres;