Commit a09ceb0e authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

sched: remove qdisc->drop 



after removal of TCA_CBQ_OVL_STRATEGY from cbq scheduler, there are no
more callers of ->drop() outside of other ->drop functions, i.e.
nothing calls them.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3a173d7

include/net/sch_generic.h

+0 −36
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ struct Qdisc_ops { 
	int 			(*enqueue)(struct sk_buff *, struct Qdisc *);

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

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

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



	int			(*init)(struct Qdisc *, struct nlattr *arg);

	void			(*reset)(struct Qdisc *);
@@ -658,22 +657,6 @@ static inline unsigned int qdisc_queue_drop_head(struct Qdisc *sch) 
	return __qdisc_queue_drop_head(sch, &sch->q);

}



static inline struct sk_buff *__qdisc_dequeue_tail(struct Qdisc *sch,

						   struct sk_buff_head *list)

{

	struct sk_buff *skb = __skb_dequeue_tail(list);



	if (likely(skb != NULL))

		qdisc_qstats_backlog_dec(sch, skb);



	return skb;

}



static inline struct sk_buff *qdisc_dequeue_tail(struct Qdisc *sch)

{

	return __qdisc_dequeue_tail(sch, &sch->q);

}



static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)

{

	return skb_peek(&sch->q);
@@ -741,25 +724,6 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, 
	return old;

}



static inline unsigned int __qdisc_queue_drop(struct Qdisc *sch,

					      struct sk_buff_head *list)

{

	struct sk_buff *skb = __qdisc_dequeue_tail(sch, list);



	if (likely(skb != NULL)) {

		unsigned int len = qdisc_pkt_len(skb);

		kfree_skb(skb);

		return len;

	}



	return 0;

}



static inline unsigned int qdisc_queue_drop(struct Qdisc *sch)

{

	return __qdisc_queue_drop(sch, &sch->q);

}



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

{

	kfree_skb(skb);

net/sched/sch_atm.c

+0 −15
Original line number Diff line number Diff line
@@ -519,20 +519,6 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch) 
	return p->link.q->ops->peek(p->link.q);

}



static unsigned int atm_tc_drop(struct Qdisc *sch)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);

	struct atm_flow_data *flow;

	unsigned int len;



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

	list_for_each_entry(flow, &p->flows, list) {

		if (flow->q->ops->drop && (len = flow->q->ops->drop(flow->q)))

			return len;

	}

	return 0;

}



static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt)

{

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

	.dequeue	= atm_tc_dequeue,

	.peek		= atm_tc_peek,

	.drop		= atm_tc_drop,

	.init		= atm_tc_init,

	.reset		= atm_tc_reset,

	.destroy	= atm_tc_destroy,

net/sched/sch_cbq.c

+0 −26
Original line number Diff line number Diff line
@@ -1025,31 +1025,6 @@ static void cbq_link_class(struct cbq_class *this) 
	}

}



static unsigned int cbq_drop(struct Qdisc *sch)

{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct cbq_class *cl, *cl_head;

	int prio;

	unsigned int len;



	for (prio = TC_CBQ_MAXPRIO; prio >= 0; prio--) {

		cl_head = q->active[prio];

		if (!cl_head)

			continue;



		cl = cl_head;

		do {

			if (cl->q->ops->drop && (len = cl->q->ops->drop(cl->q))) {

				sch->q.qlen--;

				if (!cl->q->q.qlen)

					cbq_deactivate_class(cl);

				return len;

			}

		} while ((cl = cl->next_alive) != cl_head);

	}

	return 0;

}



static void

cbq_reset(struct Qdisc *sch)

{
@@ -1791,7 +1766,6 @@ static struct Qdisc_ops cbq_qdisc_ops __read_mostly = { 
	.enqueue	=	cbq_enqueue,

	.dequeue	=	cbq_dequeue,

	.peek		=	qdisc_peek_dequeued,

	.drop		=	cbq_drop,

	.init		=	cbq_init,

	.reset		=	cbq_reset,

	.destroy	=	cbq_destroy,

net/sched/sch_choke.c

+0 −17
Original line number Diff line number Diff line
@@ -365,22 +365,6 @@ static struct sk_buff *choke_dequeue(struct Qdisc *sch) 
	return skb;

}



static unsigned int choke_drop(struct Qdisc *sch)

{

	struct choke_sched_data *q = qdisc_priv(sch);

	unsigned int len;



	len = qdisc_queue_drop(sch);

	if (len > 0)

		q->stats.other++;

	else {

		if (!red_is_idling(&q->vars))

			red_start_of_idle_period(&q->vars);

	}



	return len;

}



static void choke_reset(struct Qdisc *sch)

{

	struct choke_sched_data *q = qdisc_priv(sch);
@@ -569,7 +553,6 @@ static struct Qdisc_ops choke_qdisc_ops __read_mostly = { 
	.enqueue	=	choke_enqueue,

	.dequeue	=	choke_dequeue,

	.peek		=	choke_peek_head,

	.drop		=	choke_drop,

	.init		=	choke_init,

	.destroy	=	choke_destroy,

	.reset		=	choke_reset,

net/sched/sch_drr.c

+0 −21
Original line number Diff line number Diff line
@@ -421,26 +421,6 @@ out: 
	return NULL;

}



static unsigned int drr_drop(struct Qdisc *sch)

{

	struct drr_sched *q = qdisc_priv(sch);

	struct drr_class *cl;

	unsigned int len;



	list_for_each_entry(cl, &q->active, alist) {

		if (cl->qdisc->ops->drop) {

			len = cl->qdisc->ops->drop(cl->qdisc);

			if (len > 0) {

				sch->q.qlen--;

				if (cl->qdisc->q.qlen == 0)

					list_del(&cl->alist);

				return len;

			}

		}

	}

	return 0;

}



static int drr_init_qdisc(struct Qdisc *sch, struct nlattr *opt)

{

	struct drr_sched *q = qdisc_priv(sch);
@@ -509,7 +489,6 @@ static struct Qdisc_ops drr_qdisc_ops __read_mostly = { 
	.enqueue	= drr_enqueue,

	.dequeue	= drr_dequeue,

	.peek		= qdisc_peek_dequeued,

	.drop		= drr_drop,

	.init		= drr_init_qdisc,

	.reset		= drr_reset_qdisc,

	.destroy	= drr_destroy_qdisc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE