Revert "net: move early demux fields close to sk_refcnt"

This reverts commit 7d3ff49.
xanmod · Dec 29, 2021 · 4f0b500 · 4f0b500
1 parent 96a4b9e
commit 4f0b500
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/include/net/sock.h b/include/net/sock.h
@@ -391,11 +391,6 @@ struct sock {
 #define sk_flags		__sk_common.skc_flags
 #define sk_rxhash		__sk_common.skc_rxhash
 
-	/* early demux fields */
-	struct dst_entry	*sk_rx_dst;
-	int			sk_rx_dst_ifindex;
-	u32			sk_rx_dst_cookie;
-
 	socket_lock_t		sk_lock;
 	atomic_t		sk_drops;
 	int			sk_rcvlowat;
@@ -438,6 +433,9 @@ struct sock {
 #ifdef CONFIG_XFRM
 	struct xfrm_policy __rcu *sk_policy[2];
 #endif
+	struct dst_entry	*sk_rx_dst;
+	int			sk_rx_dst_ifindex;
+	u32			sk_rx_dst_cookie;
 
 	struct dst_entry __rcu	*sk_dst_cache;
 	atomic_t		sk_omem_alloc;