diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-11-02 06:05:14 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-11-02 06:05:14 +0300 |
| commit | 8a33dcc2f6d5cf60cc77b72c277d1eba8e4ac8fb (patch) | |
| tree | 83f899fd5d970d220e04da03b045fd46261437f1 /net/sched | |
| parent | b7b98f868987cd3e86c9bd9a6db048614933d7a0 (diff) | |
| parent | 6b278c0cb378079f3c0c61ae4a369c09ff1a4188 (diff) | |
| download | linux-8a33dcc2f6d5cf60cc77b72c277d1eba8e4ac8fb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the fixes we had queued in case there was another -rc.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_flower.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index eb6345a027e1..aab13ba11767 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -329,7 +329,8 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp, ARRAY_SIZE(fl_ct_info_to_flower_map), post_ct); skb_flow_dissect_hash(skb, &mask->dissector, &skb_key); - skb_flow_dissect(skb, &mask->dissector, &skb_key, 0); + skb_flow_dissect(skb, &mask->dissector, &skb_key, + FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP); f = fl_mask_lookup(mask, &skb_key); if (f && !tc_skip_sw(f->flags)) { |