From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 8 Aug 2024 21:03:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3cbd2090d334eb4456db0005f7b76adb3b6fd8db;p=linux.git

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/faraday/ftgmac100.c
  4186c8d9e6af ("net: ftgmac100: Ensure tx descriptor updates are visible")
  e24a6c874601 ("net: ftgmac100: Get link speed and duplex for NC-SI")
https://lore.kernel.org/0b851ec5-f91d-4dd3-99da-e81b98c9ed28@kernel.org

net/ipv4/tcp.c
  bac76cf89816 ("tcp: fix forever orphan socket caused by tcp_abort")
  edefba66d929 ("tcp: rstreason: introduce SK_RST_REASON_TCP_STATE for active reset")
https://lore.kernel.org/20240828112207.5c199d41@canb.auug.org.au

No adjacent changes.

Link: https://patch.msgid.link/20240829130829.39148-1-pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

3cbd2090d334eb4456db0005f7b76adb3b6fd8db
diff --cc drivers/net/ethernet/faraday/ftgmac100.c
index 444671b8bbe2,4c546c3aef0f..f3cc14cc757d
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@@ -1554,16 -1553,15 +1564,16 @@@ static int ftgmac100_open(struct net_de
  
  	return 0;
  
-  err_ncsi:
+ err_ncsi:
 +	phy_stop(netdev->phydev);
  	napi_disable(&priv->napi);
  	netif_stop_queue(netdev);
-  err_alloc:
+ err_alloc:
  	ftgmac100_free_buffers(priv);
  	free_irq(netdev->irq, netdev);
-  err_irq:
+ err_irq:
  	netif_napi_del(&priv->napi);
-  err_hw:
+ err_hw:
  	iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
  	ftgmac100_free_rings(priv);
  	return err;
diff --cc net/ipv4/tcp.c
index 8514257f4ecd,831a18dc7aa6..8a5680b4e786
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -4649,12 -4653,10 +4656,10 @@@ int tcp_abort(struct sock *sk, int err
  	local_bh_disable();
  	bh_lock_sock(sk);
  
- 	if (!sock_flag(sk, SOCK_DEAD)) {
- 		if (tcp_need_reset(sk->sk_state))
- 			tcp_send_active_reset(sk, GFP_ATOMIC,
- 					      SK_RST_REASON_TCP_STATE);
- 		tcp_done_with_error(sk, err);
- 	}
+ 	if (tcp_need_reset(sk->sk_state))
+ 		tcp_send_active_reset(sk, GFP_ATOMIC,
 -				      SK_RST_REASON_NOT_SPECIFIED);
++				      SK_RST_REASON_TCP_STATE);
+ 	tcp_done_with_error(sk, err);
  
  	bh_unlock_sock(sk);
  	local_bh_enable();