From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 24 Dec 2021 00:09:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: block-5.17-2022-01-21~91^2~133
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8b3f91332291fa280a56215f5189baca185998f5;p=linux-2.6-block.git

Merge git://git./linux/kernel/git/netdev/net

include/net/sock.h
  commit 8f905c0e7354 ("inet: fully convert sk->sk_rx_dst to RCU rules")
  commit 43f51df41729 ("net: move early demux fields close to sk_refcnt")
  https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

8b3f91332291fa280a56215f5189baca185998f5
diff --cc include/net/sock.h
index 37f878564d25,d47e9658da28..44cc25f0bae7
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -392,11 -391,6 +392,11 @@@ 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;
++	struct dst_entry __rcu	*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;