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

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

sch_htb: Remove local SKB queue handling code. 



Instead, adjust __qdisc_enqueue_tail() such that HTB can use it
instead.

The only other caller of __qdisc_enqueue_tail() is
qdisc_enqueue_tail() so we can move the backlog and return value
handling (which HTB doesn't need/want) to the latter.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0153167a

include/net/sch_generic.h

+5 −6
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static inline void qdisc_skb_head_init(struct qdisc_skb_head *qh) 
	qh->qlen = 0;

}



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

static inline void __qdisc_enqueue_tail(struct sk_buff *skb,

					struct qdisc_skb_head *qh)

{

	struct sk_buff *last = qh->tail;
@@ -842,14 +842,13 @@ static inline int __qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch, 
		qh->head = skb;

	}

	qh->qlen++;

	qdisc_qstats_backlog_inc(sch, skb);



	return NET_XMIT_SUCCESS;

}



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

{

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

	__qdisc_enqueue_tail(skb, &sch->q);

	qdisc_qstats_backlog_inc(sch, skb);

	return NET_XMIT_SUCCESS;

}



static inline struct sk_buff *__qdisc_dequeue_head(struct qdisc_skb_head *qh)

net/sched/sch_htb.c

+1 −17
Original line number Diff line number Diff line
@@ -577,22 +577,6 @@ static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl) 
	cl->prio_activity = 0;

}



static void htb_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,

			     struct qdisc_skb_head *qh)

{

	struct sk_buff *last = qh->tail;



	if (last) {

		skb->next = NULL;

		last->next = skb;

		qh->tail = skb;

	} else {

		qh->tail = skb;

		qh->head = skb;

	}

	qh->qlen++;

}



static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,

		       struct sk_buff **to_free)

{
@@ -603,7 +587,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
	if (cl == HTB_DIRECT) {

		/* enqueue to helper queue */

		if (q->direct_queue.qlen < q->direct_qlen) {

			htb_enqueue_tail(skb, sch, &q->direct_queue);

			__qdisc_enqueue_tail(skb, &q->direct_queue);

			q->direct_pkts++;

		} else {

			return qdisc_drop(skb, sch, to_free);