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>
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user