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

Commit f30ab418 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

pkt_sched: Remove qdisc->ops->requeue() etc. 



After implementing qdisc->ops->peek() and changing sch_netem into
classless qdisc there are no more qdisc->ops->requeue() users. This
patch removes this method with its wrappers (qdisc_requeue()), and
also unused qdisc->requeue structure. There are a few minor fixes of
warnings (htb_enqueue()) and comments btw.

The idea to kill ->requeue() and a similar patch were first developed
by David S. Miller.

Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38a7ddff

include/net/sch_generic.h

+0 −17
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct Qdisc 
	atomic_t		refcnt;

	unsigned long		state;

	struct sk_buff		*gso_skb;

	struct sk_buff_head	requeue;

	struct sk_buff_head	q;

	struct netdev_queue	*dev_queue;

	struct Qdisc		*next_sched;
@@ -112,7 +111,6 @@ struct Qdisc_ops 
	int 			(*enqueue)(struct sk_buff *, struct Qdisc *);

	struct sk_buff *	(*dequeue)(struct Qdisc *);

	struct sk_buff *	(*peek)(struct Qdisc *);

	int 			(*requeue)(struct sk_buff *, struct Qdisc *);

	unsigned int		(*drop)(struct Qdisc *);



	int			(*init)(struct Qdisc *, struct nlattr *arg);
@@ -467,21 +465,6 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch) 
	return skb;

}



static inline int __qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch,

				  struct sk_buff_head *list)

{

	__skb_queue_head(list, skb);

	sch->qstats.backlog += qdisc_pkt_len(skb);

	sch->qstats.requeues++;



	return NET_XMIT_SUCCESS;

}



static inline int qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	return __qdisc_requeue(skb, sch, &sch->q);

}



static inline void __qdisc_reset_queue(struct Qdisc *sch,

				       struct sk_buff_head *list)

{

net/sched/sch_api.c

+0 −7
Original line number Diff line number Diff line
@@ -97,11 +97,6 @@ static int tclass_notify(struct sk_buff *oskb, struct nlmsghdr *n, 


   Auxiliary routines:



   ---requeue



   requeues once dequeued packet. It is used for non-standard or

   just buggy devices, which can defer output even if netif_queue_stopped()=0.



   ---peek



   like dequeue but without removing a packet from the queue
@@ -151,8 +146,6 @@ int register_qdisc(struct Qdisc_ops *qops) 


	if (qops->enqueue == NULL)

		qops->enqueue = noop_qdisc_ops.enqueue;

	if (qops->requeue == NULL)

		qops->requeue = noop_qdisc_ops.requeue;

	if (qops->peek == NULL) {

		if (qops->dequeue == NULL) {

			qops->peek = noop_qdisc_ops.peek;

net/sched/sch_atm.c

+1 −19
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct atm_qdisc_data { 
	struct atm_flow_data	link;		/* unclassified skbs go here */

	struct atm_flow_data	*flows;		/* NB: "link" is also on this

						   list */

	struct tasklet_struct	task;		/* requeue tasklet */

	struct tasklet_struct	task;		/* dequeue tasklet */

};



/* ------------------------- Class/flow operations ------------------------- */
@@ -534,23 +534,6 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch) 
	return p->link.q->ops->peek(p->link.q);

}



static int atm_tc_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);

	int ret;



	pr_debug("atm_tc_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);

	ret = p->link.q->ops->requeue(skb, p->link.q);

	if (!ret) {

		sch->q.qlen++;

		sch->qstats.requeues++;

	} else if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		p->link.qstats.drops++;

	}

	return ret;

}



static unsigned int atm_tc_drop(struct Qdisc *sch)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);
@@ -707,7 +690,6 @@ static struct Qdisc_ops atm_qdisc_ops __read_mostly = { 
	.enqueue	= atm_tc_enqueue,

	.dequeue	= atm_tc_dequeue,

	.peek		= atm_tc_peek,

	.requeue	= atm_tc_requeue,

	.drop		= atm_tc_drop,

	.init		= atm_tc_init,

	.reset		= atm_tc_reset,

net/sched/sch_cbq.c

+0 −35
Original line number Diff line number Diff line
@@ -405,40 +405,6 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	return ret;

}



static int

cbq_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct cbq_class *cl;

	int ret;



	if ((cl = q->tx_class) == NULL) {

		kfree_skb(skb);

		sch->qstats.drops++;

		return NET_XMIT_CN;

	}

	q->tx_class = NULL;



	cbq_mark_toplevel(q, cl);



#ifdef CONFIG_NET_CLS_ACT

	q->rx_class = cl;

	cl->q->__parent = sch;

#endif

	if ((ret = cl->q->ops->requeue(skb, cl->q)) == 0) {

		sch->q.qlen++;

		sch->qstats.requeues++;

		if (!cl->next_alive)

			cbq_activate_class(cl);

		return 0;

	}

	if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		cl->qstats.drops++;

	}

	return ret;

}



/* Overlimit actions */



/* TC_CBQ_OVL_CLASSIC: (default) penalize leaf class by adding offtime */
@@ -2067,7 +2033,6 @@ static struct Qdisc_ops cbq_qdisc_ops __read_mostly = { 
	.enqueue	=	cbq_enqueue,

	.dequeue	=	cbq_dequeue,

	.peek		=	qdisc_peek_dequeued,

	.requeue	=	cbq_requeue,

	.drop		=	cbq_drop,

	.init		=	cbq_init,

	.reset		=	cbq_reset,

net/sched/sch_dsmark.c

+0 −21
Original line number Diff line number Diff line
@@ -322,26 +322,6 @@ static struct sk_buff *dsmark_peek(struct Qdisc *sch) 
	return p->q->ops->peek(p->q);

}



static int dsmark_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	struct dsmark_qdisc_data *p = qdisc_priv(sch);

	int err;



	pr_debug("dsmark_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);



	err = p->q->ops->requeue(skb, p->q);

	if (err != NET_XMIT_SUCCESS) {

		if (net_xmit_drop_count(err))

			sch->qstats.drops++;

		return err;

	}



	sch->q.qlen++;

	sch->qstats.requeues++;



	return NET_XMIT_SUCCESS;

}



static unsigned int dsmark_drop(struct Qdisc *sch)

{

	struct dsmark_qdisc_data *p = qdisc_priv(sch);
@@ -506,7 +486,6 @@ static struct Qdisc_ops dsmark_qdisc_ops __read_mostly = { 
	.enqueue	=	dsmark_enqueue,

	.dequeue	=	dsmark_dequeue,

	.peek		=	dsmark_peek,

	.requeue	=	dsmark_requeue,

	.drop		=	dsmark_drop,

	.init		=	dsmark_init,

	.reset		=	dsmark_reset,