X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=net%2Fcore%2Fflow_dissector.c;h=bc50bd331d5b6ea924728ef395e6204118c39618;hb=e60c7a9fc3b7f3ae1ae4383a43ce1a74111b91f6;hp=bac0184cf3de773d4e02a98eb06cfd8b6a0adebe;hpb=21f577b0f48fd3a8871ca4116dad0e9c41ec42b2;p=mirror_ubuntu-jammy-kernel.git

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index bac0184cf3de..bc50bd331d5b 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -238,7 +238,7 @@ void
 skb_flow_dissect_ct(const struct sk_buff *skb,
 		    struct flow_dissector *flow_dissector,
 		    void *target_container, u16 *ctinfo_map,
-		    size_t mapsize, bool post_ct)
+		    size_t mapsize, bool post_ct, u16 zone)
 {
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
 	struct flow_dissector_key_ct *key;
@@ -260,6 +260,7 @@ skb_flow_dissect_ct(const struct sk_buff *skb,
 	if (!ct) {
 		key->ct_state = TCA_FLOWER_KEY_CT_FLAGS_TRACKED |
 				TCA_FLOWER_KEY_CT_FLAGS_INVALID;
+		key->ct_zone = zone;
 		return;
 	}
 
@@ -1180,6 +1181,7 @@ proto_again:
 					 VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
 			}
 			key_vlan->vlan_tpid = saved_vlan_tpid;
+			key_vlan->vlan_eth_type = proto;
 		}
 
 		fdret = FLOW_DISSECT_RET_PROTO_AGAIN;