net/sched: cls_flower: Allow setting encapsulation fields as used key

[linux-block.git] / net / sched / cls_flower.c

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index db4cd882a989c5196aede640d14ce009cb2c2cf6..6369b74c8f5b77629be2fb31a5a9bbb831a6f1cb 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -567,6 +567,16 @@ static void fl_init_dissector(struct cls_fl_head *head,
                             FLOW_DISSECTOR_KEY_PORTS, tp);
        FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
                             FLOW_DISSECTOR_KEY_VLAN, vlan);
+       FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
+                            FLOW_DISSECTOR_KEY_ENC_KEYID, enc_key_id);
+       FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
+                            FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4);
+       FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,
+                            FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, enc_ipv6);
+       if (FL_KEY_IS_MASKED(&mask->key, enc_ipv4) ||
+           FL_KEY_IS_MASKED(&mask->key, enc_ipv6))
+               FL_KEY_SET(keys, cnt, FLOW_DISSECTOR_KEY_ENC_CONTROL,
+                          enc_control);
 
        skb_flow_dissector_init(&head->dissector, keys, cnt);
 }