From: Jakub Kicinski <kuba@kernel.org>
Date: Wed, 26 Mar 2025 11:52:22 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.15-rc1~160^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=023b1e9d265ca0662111a9df23d22b4632717a8a;p=thirdparty%2Fkernel%2Flinux.git

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

Merge in late fixes to prepare for the 6.15 net-next PR.

No conflicts, adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  919f9f497dbc ("eth: bnxt: fix out-of-range access of vnic_info array")
  fe96d717d38e ("bnxt_en: Extend queue stop/start for TX rings")

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

023b1e9d265ca0662111a9df23d22b4632717a8a
diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 08a41e9c25ff1,2cd79b59cf002..934ba9425857d
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -15892,16 -15659,10 +15903,16 @@@ static int bnxt_queue_start(struct net_
  	if (bp->flags & BNXT_FLAG_AGG_RINGS)
  		bnxt_db_write(bp, &rxr->rx_agg_db, rxr->rx_agg_prod);
  
 -	cpr = &rxr->bnapi->cp_ring;
 -	cpr->sw_stats->rx.rx_resets++;
 +	if (bp->flags & BNXT_FLAG_SHARED_RINGS) {
 +		rc = bnxt_tx_queue_start(bp, idx);
 +		if (rc)
 +			goto err_reset;
 +	}
 +
 +	napi_enable(&bnapi->napi);
 +	bnxt_db_nq_arm(bp, &cpr->cp_db, cpr->cp_raw_cons);
  
- 	for (i = 0; i <= bp->nr_vnics; i++) {
+ 	for (i = 0; i < bp->nr_vnics; i++) {
  		vnic = &bp->vnic_info[i];
  
  		rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic, true);
@@@ -15930,12 -15687,10 +15941,12 @@@ static int bnxt_queue_stop(struct net_d
  {
  	struct bnxt *bp = netdev_priv(dev);
  	struct bnxt_rx_ring_info *rxr;
 +	struct bnxt_cp_ring_info *cpr;
  	struct bnxt_vnic_info *vnic;
 +	struct bnxt_napi *bnapi;
  	int i;
  
- 	for (i = 0; i <= bp->nr_vnics; i++) {
+ 	for (i = 0; i < bp->nr_vnics; i++) {
  		vnic = &bp->vnic_info[i];
  		vnic->mru = 0;
  		bnxt_hwrm_vnic_update(bp, vnic,