| Message ID | 20230512133843.1358661-1-shenwei.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6ead9c98cafcbc6992cf35f0ca393df2c03e3316 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: fec: remove the xdp_return_frame when lack of tx BDs | expand |
The 05/12/2023 08:38, Shenwei Wang wrote: > > In the implementation, the sent_frame count does not increment when > transmit errors occur. Therefore, bq_xmit_all() will take care of > returning the XDP frames. Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> > > Fixes: 26312c685ae0 ("net: fec: correct the counting of XDP sent frames") > Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> > --- > drivers/net/ethernet/freescale/fec_main.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index 42ec6ca3bf03..2a3e8b69b70a 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -3798,7 +3798,6 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep, > 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; > } > > -- > 2.34.1 > >
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 12 May 2023 08:38:43 -0500 you wrote: > In the implementation, the sent_frame count does not increment when > transmit errors occur. Therefore, bq_xmit_all() will take care of > returning the XDP frames. > > Fixes: 26312c685ae0 ("net: fec: correct the counting of XDP sent frames") > Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> > > [...] Here is the summary with links: - [net] net: fec: remove the xdp_return_frame when lack of tx BDs https://git.kernel.org/netdev/net/c/6ead9c98cafc You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 42ec6ca3bf03..2a3e8b69b70a 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3798,7 +3798,6 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep, 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; }
In the implementation, the sent_frame count does not increment when transmit errors occur. Therefore, bq_xmit_all() will take care of returning the XDP frames. Fixes: 26312c685ae0 ("net: fec: correct the counting of XDP sent frames") Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> --- drivers/net/ethernet/freescale/fec_main.c | 1 - 1 file changed, 1 deletion(-) -- 2.34.1