From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 18 May 2023 21:39:34 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.6.7~2536^2~255
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90223c1136b2930751116fb7de9675f55843f3ad;p=platform%2Fkernel%2Flinux-starfive.git

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

Conflicts:

drivers/net/ethernet/freescale/fec_main.c
  6ead9c98cafc ("net: fec: remove the xdp_return_frame when lack of tx BDs")
  144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")

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

90223c1136b2930751116fb7de9675f55843f3ad
diff --cc drivers/net/ethernet/freescale/fec_main.c
index cd215ab,577d948..6d0b46c
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -3798,8 -3798,7 +3798,7 @@@ static int fec_enet_txq_xmit_frame(stru
  	entries_free = fec_enet_get_free_txdesc_num(txq);
  	if (entries_free < MAX_SKB_FRAGS + 1) {
  		netdev_err(fep->netdev, "NOT enough BD for SG!\n");
- 		xdp_return_frame(frame);
 -		return NETDEV_TX_BUSY;
 +		return -EBUSY;
  	}
  
  	/* Fill in a Tx ring entry */