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>
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index df702a7..e7c4924 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -634,9 +634,6 @@
struct netdev_queue rx_queue;
struct netdev_queue tx_queue ____cacheline_aligned_in_smp;
-
- struct Qdisc *qdisc_ingress;
-
unsigned long tx_queue_len; /* Max frames per queue allowed */
/* Partially transmitted GSO packet. */
diff --git a/net/core/dev.c b/net/core/dev.c
index ce79c28..ab760a9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2033,7 +2033,7 @@
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 @@
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) {
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 2313fa7..4003c28 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -450,14 +450,15 @@
qdisc_lock_tree(dev);
if (qdisc && qdisc->flags&TCQ_F_INGRESS) {
- oqdisc = dev->qdisc_ingress;
+ dev_queue = &dev->rx_queue;
+ oqdisc = dev_queue->qdisc;
/* Prune old scheduler */
if (oqdisc && atomic_read(&oqdisc->refcnt) <= 1) {
/* delete */
qdisc_reset(oqdisc);
- dev->qdisc_ingress = NULL;
+ dev_queue->qdisc = NULL;
} else { /* new */
- dev->qdisc_ingress = qdisc;
+ dev_queue->qdisc = qdisc;
}
} else {
@@ -739,7 +740,7 @@
return -ENOENT;
q = qdisc_leaf(p, clid);
} else { /* ingress */
- q = dev->qdisc_ingress;
+ q = dev->rx_queue.qdisc;
}
} else {
struct netdev_queue *dev_queue = &dev->tx_queue;
@@ -814,7 +815,7 @@
return -ENOENT;
q = qdisc_leaf(p, clid);
} else { /*ingress */
- q = dev->qdisc_ingress;
+ q = dev->rx_queue.qdisc;
}
} else {
struct netdev_queue *dev_queue = &dev->tx_queue;