diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
| commit | 1bab8d4c488be22d57f9dd09968c90a0ddc413bf (patch) | |
| tree | 81318cd13170a3b6b72489f63e92adb0eaf49693 /net/sched | |
| parent | Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer' (diff) | |
| parent | xen-netfront: do not assume sk_buff_head list is empty in error handling (diff) | |
| download | linux-dev-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.tar.xz linux-dev-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Pull in bug fixes from 'net' tree for the merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index ac28f6a5d70e..17bd8f539bc7 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -985,6 +985,9 @@ static void qdisc_destroy(struct Qdisc *qdisc) void qdisc_put(struct Qdisc *qdisc) { + if (!qdisc) + return; + if (qdisc->flags & TCQ_F_BUILTIN || !refcount_dec_and_test(&qdisc->refcnt)) return; |