Commit 3f3c7eec authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by David S. Miller

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: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10770bc2
...@@ -621,7 +621,7 @@ void qdisc_reset(struct Qdisc *qdisc) ...@@ -621,7 +621,7 @@ void qdisc_reset(struct Qdisc *qdisc)
ops->reset(qdisc); ops->reset(qdisc);
if (qdisc->gso_skb) { if (qdisc->gso_skb) {
kfree_skb(qdisc->gso_skb); kfree_skb_list(qdisc->gso_skb);
qdisc->gso_skb = NULL; qdisc->gso_skb = NULL;
qdisc->q.qlen = 0; qdisc->q.qlen = 0;
} }
...@@ -657,7 +657,7 @@ void qdisc_destroy(struct Qdisc *qdisc) ...@@ -657,7 +657,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
module_put(ops->owner); module_put(ops->owner);
dev_put(qdisc_dev(qdisc)); 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, * gen_estimator est_timer() might access qdisc->q.lock,
* wait a RCU grace period before freeing qdisc. * wait a RCU grace period before freeing qdisc.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment