diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2015-10-19 08:35:30 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2015-10-19 08:35:30 +0300 |
| commit | ec0a2ed6d8a5e555edef907895c041e285fdb495 (patch) | |
| tree | a4c8d982f8ac820b1b60818df22ad3ccac2036d5 /kernel/net/sched/cls_u32.c | |
| parent | 342fa5dfa053559f47caad657132522496dcf1b3 (diff) | |
These changes are a raw update to a vanilla kernel 4.1.10, with the
recently announced rt patch patch-4.1.10-rt10.patch. No further changes
needed.
Change-Id: I9a0cf084498133b10771e744b6da4b29dff706ba
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/net/sched/cls_u32.c')
| -rw-r--r-- | kernel/net/sched/cls_u32.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/net/sched/cls_u32.c b/kernel/net/sched/cls_u32.c index cab9e9b43..4fbb67430 100644 --- a/kernel/net/sched/cls_u32.c +++ b/kernel/net/sched/cls_u32.c @@ -490,6 +490,19 @@ static bool u32_destroy(struct tcf_proto *tp, bool force) return false; } } + + if (tp_c->refcnt > 1) + return false; + + if (tp_c->refcnt == 1) { + struct tc_u_hnode *ht; + + for (ht = rtnl_dereference(tp_c->hlist); + ht; + ht = rtnl_dereference(ht->next)) + if (!ht_empty(ht)) + return false; + } } if (root_ht && --root_ht->refcnt == 0) |