From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 27 Jun 2024 19:12:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: io_uring-6.11-20240722~71^2~131
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=193b9b200224dab4eaec407eb2955303a521f5b6;p=linux-block.git

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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:
  e3f02f32a050 ("ionic: fix kernel panic due to multi-buffer handling")
  d9c04209990b ("ionic: Mark error paths in the data path as unlikely")

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

193b9b200224dab4eaec407eb2955303a521f5b6
diff --cc drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 5bf13a5d411c,9fdd7cd3ef19..fc79baad4561
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@@ -593,12 -607,8 +607,8 @@@ static bool ionic_run_xdp(struct ionic_
  		break;
  
  	case XDP_REDIRECT:
- 		/* unmap the pages before handing them to a different device */
- 		dma_unmap_page(rxq->dev, buf_info->dma_addr,
- 			       IONIC_PAGE_SIZE, DMA_FROM_DEVICE);
- 
  		err = xdp_do_redirect(netdev, &xdp_buf, xdp_prog);
 -		if (err) {
 +		if (unlikely(err)) {
  			netdev_dbg(netdev, "xdp_do_redirect err %d\n", err);
  			goto out_xdp_abort;
  		}