Commit 321090e7 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[PKT_SCHED]: Add and use prio2list() in the pfifo_fast qdisc 



prio2list() returns the relevant sk_buff_head for the
band specified by the priority for a given skb.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 821d24ae

net/sched/sch_generic.c

+9 −8
Original line number Diff line number Diff line
@@ -311,12 +311,17 @@ static const u8 prio2band[TC_PRIO_MAX+1] = 
   generic prio+fifo combination.

 */



static int

pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc* qdisc)

static inline struct sk_buff_head *prio2list(struct sk_buff *skb,

					     struct Qdisc *qdisc)

{

	struct sk_buff_head *list = qdisc_priv(qdisc);

	return list + prio2band[skb->priority & TC_PRIO_MAX];

}



	list += prio2band[skb->priority&TC_PRIO_MAX];

static int

pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc* qdisc)

{

	struct sk_buff_head *list = prio2list(skb, qdisc);



	if (skb_queue_len(list) < qdisc->dev->tx_queue_len) {

		qdisc->q.qlen++;
@@ -345,12 +350,8 @@ pfifo_fast_dequeue(struct Qdisc* qdisc) 
static int

pfifo_fast_requeue(struct sk_buff *skb, struct Qdisc* qdisc)

{

	struct sk_buff_head *list = qdisc_priv(qdisc);



	list += prio2band[skb->priority&TC_PRIO_MAX];



	qdisc->q.qlen++;

	return __qdisc_requeue(skb, qdisc, list);

	return __qdisc_requeue(skb, qdisc, prio2list(skb, qdisc));

}



static void