aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index ce79c28d739d..ab760a954d99 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2033,7 +2033,7 @@ static int ing_filter(struct sk_buff *skb)
2033 rxq = &dev->rx_queue; 2033 rxq = &dev->rx_queue;
2034 2034
2035 spin_lock(&rxq->lock); 2035 spin_lock(&rxq->lock);
2036 if ((q = dev->qdisc_ingress) != NULL) 2036 if ((q = rxq->qdisc) != NULL)
2037 result = q->enqueue(skb, q); 2037 result = q->enqueue(skb, q);
2038 spin_unlock(&rxq->lock); 2038 spin_unlock(&rxq->lock);
2039 2039
@@ -2044,7 +2044,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
2044 struct packet_type **pt_prev, 2044 struct packet_type **pt_prev,
2045 int *ret, struct net_device *orig_dev) 2045 int *ret, struct net_device *orig_dev)
2046{ 2046{
2047 if (!skb->dev->qdisc_ingress) 2047 if (!skb->dev->rx_queue.qdisc)
2048 goto out; 2048 goto out;
2049 2049
2050 if (*pt_prev) { 2050 if (*pt_prev) {