From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 15 Feb 2024 22:01:43 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.9-rc1~159^2~246
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73be9a3aabdd976123e7f05dd20dbcf131347e84;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

net/core/dev.c
  9f30831390ed ("net: add rcu safety to rtnl_prop_list_size()")
  723de3ebef03 ("net: free altname using an RCU callback")

net/unix/garbage.c
  11498715f266 ("af_unix: Remove io_uring code for GC.")
  25236c91b5ab ("af_unix: Fix task hung while purging oob_skb in GC.")

drivers/net/ethernet/renesas/ravb_main.c
  ed4adc07207d ("net: ravb: Count packets instead of descriptors in GbEth RX path"
)
  c2da9408579d ("ravb: Add Rx checksum offload support for GbEth")

net/mptcp/protocol.c
  bdd70eb68913 ("mptcp: drop the push_pending field")
  28e5c1380506 ("mptcp: annotate lockless accesses around read-mostly fields")

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

73be9a3aabdd976123e7f05dd20dbcf131347e84
diff --cc drivers/net/ethernet/renesas/ravb_main.c
index f9a1e9038dbf1,f7566cfa45ca3..529670852bd6d
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@@ -865,10 -815,8 +861,10 @@@ static bool ravb_rx_gbeth(struct net_de
  				skb = ravb_get_skb_gbeth(ndev, entry, desc);
  				skb_put(skb, pkt_len);
  				skb->protocol = eth_type_trans(skb, ndev);
 +				if (ndev->features & NETIF_F_RXCSUM)
 +					ravb_rx_csum_gbeth(skb);
  				napi_gro_receive(&priv->napi[q], skb);
- 				stats->rx_packets++;
+ 				rx_packets++;
  				stats->rx_bytes += pkt_len;
  				break;
  			case DT_FSTART:
@@@ -894,11 -842,9 +890,11 @@@
  				dev_kfree_skb(skb);
  				priv->rx_1st_skb->protocol =
  					eth_type_trans(priv->rx_1st_skb, ndev);
 +				if (ndev->features & NETIF_F_RXCSUM)
 +					ravb_rx_csum_gbeth(skb);
  				napi_gro_receive(&priv->napi[q],
  						 priv->rx_1st_skb);
- 				stats->rx_packets++;
+ 				rx_packets++;
  				stats->rx_bytes += pkt_len;
  				break;
  			}
diff --cc net/mptcp/protocol.c
index ad39f54b3a81b,8ef2927ebca29..c7af62c057bc7
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -3147,14 -3148,14 +3153,13 @@@ static int mptcp_disconnect(struct soc
  	mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE);
  	WRITE_ONCE(msk->flags, 0);
  	msk->cb_flags = 0;
- 	msk->push_pending = 0;
  	msk->recovery = false;
 -	msk->can_ack = false;
 -	msk->fully_established = false;
 -	msk->rcv_data_fin = false;
 -	msk->snd_data_fin_enable = false;
 -	msk->rcv_fastclose = false;
 -	msk->use_64bit_ack = false;
 -	msk->bytes_consumed = 0;
 +	WRITE_ONCE(msk->can_ack, false);
 +	WRITE_ONCE(msk->fully_established, false);
 +	WRITE_ONCE(msk->rcv_data_fin, false);
 +	WRITE_ONCE(msk->snd_data_fin_enable, false);
 +	WRITE_ONCE(msk->rcv_fastclose, false);
 +	WRITE_ONCE(msk->use_64bit_ack, false);
  	WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
  	mptcp_pm_data_reset(msk);
  	mptcp_ca_reset(sk);