Message ID | 20230519020113.1670786-1-wei.fang@nxp.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 2ae9c66b04554bf5b3eeaab8c12a0bfb9f28ebde |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [V2,net-next] net: fec: remove useless fec_enet_reset_skb() | expand |
On Fri, May 19, 2023 at 10:01:13AM +0800, wei.fang@nxp.com wrote: > From: Wei Fang <wei.fang@nxp.com> > > This patch is a cleanup for fec driver. The fec_enet_reset_skb() > is used to free skb buffers for tx queues and is only invoked in > fec_restart(). However, fec_enet_bd_init() also resets skb buffers > and is invoked in fec_restart() too. So fec_enet_reset_skb() is > redundant and useless. > > Signed-off-by: Wei Fang <wei.fang@nxp.com> > --- > V2 change: > According to Simon Horman's suggestion, it's just a cleanup and without > user-visible problem, so change the target tree from net to net-next. Thanks Wei Fang, looks good. Reviewed-by: Simon Horman <simon.horman@corigine.com>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 19 May 2023 10:01:13 +0800 you wrote: > From: Wei Fang <wei.fang@nxp.com> > > This patch is a cleanup for fec driver. The fec_enet_reset_skb() > is used to free skb buffers for tx queues and is only invoked in > fec_restart(). However, fec_enet_bd_init() also resets skb buffers > and is invoked in fec_restart() too. So fec_enet_reset_skb() is > redundant and useless. > > [...] Here is the summary with links: - [V2,net-next] net: fec: remove useless fec_enet_reset_skb() https://git.kernel.org/netdev/net-next/c/2ae9c66b0455 You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 10cb5ad2d758..e1975a3c7234 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1011,24 +1011,6 @@ static void fec_enet_enable_ring(struct net_device *ndev) } } -static void fec_enet_reset_skb(struct net_device *ndev) -{ - struct fec_enet_private *fep = netdev_priv(ndev); - struct fec_enet_priv_tx_q *txq; - int i, j; - - for (i = 0; i < fep->num_tx_queues; i++) { - txq = fep->tx_queue[i]; - - for (j = 0; j < txq->bd.ring_size; j++) { - if (txq->tx_skbuff[j]) { - dev_kfree_skb_any(txq->tx_skbuff[j]); - txq->tx_skbuff[j] = NULL; - } - } - } -} - /* * This function is called to start or restart the FEC during a link * change, transmit timeout, or to reconfigure the FEC. The network @@ -1071,9 +1053,6 @@ fec_restart(struct net_device *ndev) fec_enet_enable_ring(ndev); - /* Reset tx SKB buffers. */ - fec_enet_reset_skb(ndev); - /* Enable MII mode */ if (fep->full_duplex == DUPLEX_FULL) { /* FD enable */