diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-09 09:49:00 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-09 09:49:00 +0400 |
| commit | 816f3258e70db38d6d92c8d871377179fd69160f (patch) | |
| tree | 7ab28132592c82e2ac40317733ea1dd7d6f4e5b5 /net/core | |
| parent | b0e1e6462df3c5944010b3328a546d8fe5d932cd (diff) | |
| download | linux-816f3258e70db38d6d92c8d871377179fd69160f.tar.xz | |
netdev: Kill qdisc_ingress, use netdev->rx_queue.qdisc instead.
Now that our qdisc management is bi-directional, per-queue, and fully
orthogonal, there is no reason to have a special ingress qdisc pointer
in struct net_device.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -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 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) rxq = &dev->rx_queue; spin_lock(&rxq->lock); - if ((q = dev->qdisc_ingress) != NULL) + if ((q = rxq->qdisc) != NULL) result = q->enqueue(skb, q); spin_unlock(&rxq->lock); @@ -2044,7 +2044,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, struct net_device *orig_dev) { - if (!skb->dev->qdisc_ingress) + if (!skb->dev->rx_queue.qdisc) goto out; if (*pt_prev) { |