Commit 3f3c7eec authored Sep 03, 2014 by Jesper Dangaard Brouer Committed by David S. Miller Sep 03, 2014

qdisc: exit case fixes for skb list handling in qdisc layer



More minor fixes to merge commit 53fda7f7 (Merge branch 'xmit_list')
that allows us to work with a list of SKBs.

Fixing exit cases in qdisc_reset() and qdisc_destroy(), where a
leftover requeued SKB (qdisc->gso_skb) can have the potential of
being a skb list, thus use kfree_skb_list().

This is a followup to commit 10770bc2 ("qdisc: adjustments for
API allowing skb list xmits").

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 10770bc2

net/sched/sch_generic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -621,7 +621,7 @@ void qdisc_reset(struct Qdisc *qdisc)
		ops->reset(qdisc);

		if (qdisc->gso_skb) {
		kfree_skb(qdisc->gso_skb);
		kfree_skb_list(qdisc->gso_skb);
		qdisc->gso_skb = NULL;
		qdisc->q.qlen = 0;
		}
		@@ -657,7 +657,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
		module_put(ops->owner);
		dev_put(qdisc_dev(qdisc));

		kfree_skb(qdisc->gso_skb);
		kfree_skb_list(qdisc->gso_skb);
		/*
		* gen_estimator est_timer() might access qdisc->q.lock,
		* wait a RCU grace period before freeing qdisc.

Admin message