commit 0e92c02c3f8e6863d4c1c11756db08700c54c279
author Pablo Neira Ayuso <pablo@netfilter.org> Fri Mar 03 10:55:50 2023 +0100
committer Pablo Neira Ayuso <pablo@netfilter.org> Tue Apr 11 16:45:39 2023 +0200
tree 0aa438c08aa93254f1c1d1e27ab2c34d9b795818
parent 4059b16dabaa8313eec730b7eba7262646a0b22c

flowtable: consolidate header reset

net/netfilter/nf_flow_table_inet.c

diff --git a/net/netfilter/nf_flow_table_inet.c b/net/netfilter/nf_flow_table_inet.c
index 5e87f32..1c77e24 100644
--- a/net/netfilter/nf_flow_table_inet.c
+++ b/net/netfilter/nf_flow_table_inet.c
@@ -20,6 +20,11 @@ __nf_flow_offload_hook_list(void *priv, struct sk_buff *unused,
 	__be16 proto;
 
 	list_for_each_entry_safe(skb, next, skb_list, list) {
+		skb_reset_network_header(skb);
+		if (!skb_transport_header_was_set(skb))
+			skb_reset_transport_header(skb);
+		skb_reset_mac_len(skb);
+
 		switch (skb->protocol) {
 		case htons(ETH_P_8021Q):
 			veth = (struct vlan_ethhdr *)skb_mac_header(skb);

net/netfilter/nf_flow_table_ip.c

diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 02a54e9..21afb53 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -796,11 +796,6 @@ void __nf_flow_offload_ip_hook_list(void *priv, struct list_head *head,
 	list_for_each_entry_safe(skb, n, head, list) {
 		skb_list_del_init(skb);
 
-		skb_reset_network_header(skb);
-		if (!skb_transport_header_was_set(skb))
-			skb_reset_transport_header(skb);
-		skb_reset_mac_len(skb);
-
 		ctx.hdrsize = 0;
 		ctx.offset = 0;
 
@@ -1429,11 +1424,6 @@ void __nf_flow_offload_ipv6_hook_list(void *priv, struct list_head *head,
 	list_for_each_entry_safe(skb, n, head, list) {
 		skb_list_del_init(skb);
 
-		skb_reset_network_header(skb);
-		if (!skb_transport_header_was_set(skb))
-			skb_reset_transport_header(skb);
-		skb_reset_mac_len(skb);
-
 		ctx.hdrsize = 0;
 		ctx.offset = 0;