diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-20 19:53:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-20 20:53:36 +0100 |
| commit | 2be09de7d6a06f58e768de1255a687c9aaa66606 (patch) | |
| tree | 298f9e04caf105873d987e807eccba27710a49cc /net/sched/cls_flower.c | |
| parent | Merge branch 'bnxt_en-next' (diff) | |
| parent | Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-2be09de7d6a06f58e768de1255a687c9aaa66606.tar.xz linux-2be09de7d6a06f58e768de1255a687c9aaa66606.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.
Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_flower.c')
| -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 1eb2e2c31dd5..dad04e710493 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1372,10 +1372,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); } |