Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 816f3258 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent b0e1e646

include/linux/netdevice.h

+0 −3
Original line number Diff line number Diff line
@@ -634,9 +634,6 @@ struct net_device 


	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. */

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

net/sched/sch_api.c

+6 −5
Original line number Diff line number Diff line
@@ -450,14 +450,15 @@ dev_graft_qdisc(struct net_device *dev, struct Qdisc *qdisc) 


	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 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
					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 @@ replay: 
					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;