Commit 5579ee46 authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

net_sched: export pfifo_fast prio2band[] 



pfifo_fast prio2band[] is renamed to sch_default_prio2band[]
and exported because we want to share it in FQ.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarDave Taht <dave.taht@gmail.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 2ae45136

include/net/sch_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ static inline void sch_tree_unlock(struct Qdisc *q) 
extern struct Qdisc noop_qdisc;

extern struct Qdisc_ops noop_qdisc_ops;

extern struct Qdisc_ops pfifo_fast_ops;

extern const u8 sch_default_prio2band[TC_PRIO_MAX + 1];

extern struct Qdisc_ops mq_qdisc_ops;

extern struct Qdisc_ops noqueue_qdisc_ops;

extern const struct Qdisc_ops *default_qdisc_ops;

net/sched/sch_generic.c

+5 −4
Original line number Diff line number Diff line
@@ -694,9 +694,10 @@ struct Qdisc_ops noqueue_qdisc_ops __read_mostly = { 
	.owner		=	THIS_MODULE,

};



static const u8 prio2band[TC_PRIO_MAX + 1] = {

const u8 sch_default_prio2band[TC_PRIO_MAX + 1] = {

	1, 2, 2, 2, 1, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1

};

EXPORT_SYMBOL(sch_default_prio2band);



/* 3-band FIFO queue: old style, but should be a bit faster than

   generic prio+fifo combination.
@@ -721,7 +722,7 @@ static inline struct skb_array *band2list(struct pfifo_fast_priv *priv, 
static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,

			      struct sk_buff **to_free)

{

	int band = prio2band[skb->priority & TC_PRIO_MAX];

	int band = sch_default_prio2band[skb->priority & TC_PRIO_MAX];

	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);

	struct skb_array *q = band2list(priv, band);

	unsigned int pkt_len = qdisc_pkt_len(skb);
@@ -830,7 +831,7 @@ static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb) 
{

	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };



	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);

	memcpy(&opt.priomap, sch_default_prio2band, TC_PRIO_MAX + 1);

	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))

		goto nla_put_failure;

	return skb->len;