update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/net/netfilter/nf_tables_trace.c
..
..
@@ -113,17 +113,17 @@
113
113
 	int off = skb_network_offset(skb);
114
114
 	unsigned int len, nh_end;
115
115
 
116
-	nh_end = pkt->tprot_set ? pkt->xt.thoff : skb->len;
116
+	nh_end = pkt->tprot_set ? nft_thoff(pkt) : skb->len;
117
117
 	len = min_t(unsigned int, nh_end - skb_network_offset(skb),
118
118
 		    NFT_TRACETYPE_NETWORK_HSIZE);
119
119
 	if (trace_fill_header(nlskb, NFTA_TRACE_NETWORK_HEADER, skb, off, len))
120
120
 		return -1;
121
121
 
122
122
 	if (pkt->tprot_set) {
123
-		len = min_t(unsigned int, skb->len - pkt->xt.thoff,
123
+		len = min_t(unsigned int, skb->len - nft_thoff(pkt),
124
124
 			    NFT_TRACETYPE_TRANSPORT_HSIZE);
125
125
 		if (trace_fill_header(nlskb, NFTA_TRACE_TRANSPORT_HEADER, skb,
126
-				      pkt->xt.thoff, len))
126
+				      nft_thoff(pkt), len))
127
127
 			return -1;
128
128
 	}
129
129