diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
| commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
| tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /net/sched | |
| parent | b4d9785ce5c035b672f25df56706d0ff4e68b74e (diff) | |
| parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
| download | linux-e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_flower.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 726fc9c5910f..258dc45ab7e3 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -305,6 +305,7 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp, struct cls_fl_filter *f; list_for_each_entry_rcu(mask, &head->masks, list) { + flow_dissector_init_keys(&skb_key.control, &skb_key.basic); fl_clear_masked_range(&skb_key, mask); skb_flow_dissect_meta(skb, &mask->dissector, &skb_key); |