From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 16 Jun 2026 21:57:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d755d45bc08a57a3b845b850f8760de922a499bf;p=thirdparty%2Flinux.git

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

Merge in late fixes in preparation for the net-next PR.

Conflicts:

net/tls/tls_sw.c
  406e8a651a7b ("net: skmsg: preserve sg.copy across SG transforms")
  79511603a65b ("tls: remove dead sockmap (psock) handling from the SW path")

drivers/net/ethernet/microsoft/mana/mana_en.c
  f8fd56977eeea ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")
  d07efe5a6e641 ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")
https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk

No adjacent changes.

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

d755d45bc08a57a3b845b850f8760de922a499bf
diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
index 26aef21c6c2c8,d7de4c4d25bbe..87862b0434c76
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@@ -2399,15 -2332,14 +2399,17 @@@ static void mana_destroy_txq(struct man
  			napi_synchronize(napi);
  			napi_disable_locked(napi);
  			netif_napi_del_locked(napi);
 -			apc->tx_qp[i].txq.napi_initialized = false;
 +			apc->tx_qp[i]->txq.napi_initialized = false;
  		}
- 		mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
 -		if (apc->tx_qp[i].tx_object != INVALID_MANA_HANDLE)
 -			mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object);
+ 
 -		mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq);
++		if (apc->tx_qp[i]->tx_object != INVALID_MANA_HANDLE)
++			mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
 +
 +		mana_deinit_cq(apc, &apc->tx_qp[i]->tx_cq);
  
 -		mana_deinit_txq(apc, &apc->tx_qp[i].txq);
 +		mana_deinit_txq(apc, &apc->tx_qp[i]->txq);
 +
 +		kvfree(apc->tx_qp[i]);
  	}
  
  	kfree(apc->tx_qp);