Commit 5f86173b authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by David S. Miller
Browse files

net_sched: Add qdisc_enqueue wrapper 



Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db7a94d6

include/net/sch_generic.h

+10 −0
Original line number Diff line number Diff line
@@ -306,6 +306,16 @@ static inline bool qdisc_tx_is_noop(const struct net_device *dev) 
	return true;

}



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

{

	return sch->enqueue(skb, sch);

}



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

{

	return qdisc_enqueue(skb, sch);

}



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

				       struct sk_buff_head *list)

{

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ gso: 


		spin_lock(root_lock);



		rc = q->enqueue(skb, q);

		rc = qdisc_enqueue_root(skb, q);

		qdisc_run(q);



		spin_unlock(root_lock);
@@ -2083,7 +2083,7 @@ static int ing_filter(struct sk_buff *skb) 
	q = rxq->qdisc;

	if (q) {

		spin_lock(qdisc_lock(q));

		result = q->enqueue(skb, q);

		result = qdisc_enqueue_root(skb, q);

		spin_unlock(qdisc_lock(q));

	}

net/mac80211/wme.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void ieee80211_requeue(struct ieee80211_local *local, int queue) 
		root_lock = qdisc_root_lock(qdisc);



		spin_lock(root_lock);

		qdisc->enqueue(skb, qdisc);

		qdisc_enqueue_root(skb, qdisc);

		spin_unlock(root_lock);

	}

net/sched/sch_atm.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
#endif

	}



	ret = flow->q->enqueue(skb, flow->q);

	ret = qdisc_enqueue(skb, flow->q);

	if (ret != 0) {

drop: __maybe_unused

		sch->qstats.drops++;

net/sched/sch_cbq.c

+3 −2
Original line number Diff line number Diff line
@@ -387,7 +387,8 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
#ifdef CONFIG_NET_CLS_ACT

	cl->q->__parent = sch;

#endif

	if ((ret = cl->q->enqueue(skb, cl->q)) == NET_XMIT_SUCCESS) {

	ret = qdisc_enqueue(skb, cl->q);

	if (ret == NET_XMIT_SUCCESS) {

		sch->q.qlen++;

		sch->bstats.packets++;

		sch->bstats.bytes+=len;
@@ -671,7 +672,7 @@ static int cbq_reshape_fail(struct sk_buff *skb, struct Qdisc *child) 
		q->rx_class = cl;

		cl->q->__parent = sch;



		if (cl->q->enqueue(skb, cl->q) == 0) {

		if (qdisc_enqueue(skb, cl->q) == 0) {

			sch->q.qlen++;

			sch->bstats.packets++;

			sch->bstats.bytes+=len;