diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2014-09-03 12:12:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-04 05:41:42 +0200 |
| commit | 3f3c7eec60ad4f990d7bcbc41a1597a4fc7268f6 (patch) | |
| tree | 768ec9ec0af14eb7e1fc901f3a9fd2cb9ed70c13 /net/sched | |
| parent | qdisc: adjustments for API allowing skb list xmits (diff) | |
| download | linux-3f3c7eec60ad4f990d7bcbc41a1597a4fc7268f6.tar.xz linux-3f3c7eec60ad4f990d7bcbc41a1597a4fc7268f6.zip | |
qdisc: exit case fixes for skb list handling in qdisc layer
More minor fixes to merge commit 53fda7f7f9e (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 10770bc2d1 ("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>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 5b261e91bdbd..19696ebe9ebc 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -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. |