diff options
| author |   Roi Dayan <roid@mellanox.com> | 2018-12-19 18:07:56 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-19 16:36:55 -0800 |
| commit | 599d2570b2da7c2f5419332b42b7999d79c85959 (patch) | |
| tree | d2532ae49ed11038ed6cba17df6548c4b12a44a2 | |
| parent | net/tls: allocate tls context using GFP_ATOMIC (diff) | |
| download | linux-dev-599d2570b2da7c2f5419332b42b7999d79c85959.tar.xz linux-dev-599d2570b2da7c2f5419332b42b7999d79c85959.zip | |
net/sched: cls_flower: Remove old entries from rhashtable
When replacing a rule we add the new rule to the rhashtable
but only remove the old if not in skip_sw.
This commit fix this and remove the old rule anyway.
Fixes: 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under skip_sw")
Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/cls_flower.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 71312d7bd8f4..208d940464d7 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1258,10 +1258,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, fnew->flags |= TCA_CLS_FLAGS_NOT_IN_HW; if (fold) { - if (!tc_skip_sw(fold->flags)) - rhashtable_remove_fast(&fold->mask->ht, - &fold->ht_node, - fold->mask->filter_ht_params); + rhashtable_remove_fast(&fold->mask->ht, + &fold->ht_node, + fold->mask->filter_ht_params); if (!tc_skip_hw(fold->flags)) fl_hw_destroy_filter(tp, fold, NULL); } |