From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 5 Jan 2024 02:04:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e63c1822ac32a865dd02a18107fc933fd7b30f6f;p=linux.git

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
  0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/

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

e63c1822ac32a865dd02a18107fc933fd7b30f6f
diff --cc MAINTAINERS
index 2b916990d7f02,b30a37e2eb685..0897c84677016
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15441,10 -15434,10 +15450,10 @@@ F:	Documentation/devicetree/bindings/ne
  F:	drivers/bluetooth/btnxpuart.c
  
  NXP C45 TJA11XX PHY DRIVER
- M:	Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
+ M:	Andrei Botila <andrei.botila@oss.nxp.com>
  L:	netdev@vger.kernel.org
  S:	Maintained
 -F:	drivers/net/phy/nxp-c45-tja11xx.c
 +F:	drivers/net/phy/nxp-c45-tja11xx*
  
  NXP FSPI DRIVER
  M:	Han Xu <han.xu@nxp.com>
diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8f10ab4d4a438,e1f1e646cf480..b70ddd33e9ed6
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -14088,18 -13081,30 +14090,16 @@@ static void bnxt_cfg_ntp_filters(struc
  				if (rc)
  					del = true;
  				else
 -					set_bit(BNXT_FLTR_VALID, &fltr->state);
 +					set_bit(BNXT_FLTR_VALID, &fltr->base.state);
  			}
  
 -			if (del) {
 -				spin_lock_bh(&bp->ntp_fltr_lock);
 -				hlist_del_rcu(&fltr->hash);
 -				bp->ntp_fltr_count--;
 -				spin_unlock_bh(&bp->ntp_fltr_lock);
 -				synchronize_rcu();
 -				clear_bit(fltr->sw_id, bp->ntp_fltr_bmap);
 -				kfree(fltr);
 -			}
 +			if (del)
 +				bnxt_del_ntp_filter(bp, fltr);
  		}
  	}
- 	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))
- 		netdev_info(bp->dev, "Receive PF driver unload event!\n");
 +#endif
  }
  
 -#else
 -
 -static void bnxt_cfg_ntp_filters(struct bnxt *bp)
 -{
 -}
 -
 -#endif /* CONFIG_RFS_ACCEL */
 -
  static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,
  				    unsigned int entry, struct udp_tunnel_info *ti)
  {
diff --cc drivers/net/virtio_net.c
index 25cf44ce95dd2,51b1868d2f220..3cb8aa1938841
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -2435,12 -2402,10 +2448,12 @@@ static int virtnet_rx_resize(struct vir
  
  	qindex = rq - vi->rq;
  
 -	if (running)
 +	if (running) {
  		napi_disable(&rq->napi);
 +		cancel_work_sync(&rq->dim.work);
 +	}
  
- 	err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_free_unused_buf);
+ 	err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
  	if (err)
  		netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qindex, err);