net: stmmac: avoid shadowing global buf_sz
Subsystems (5)
PATCH 1/1 net: stmmac: avoid shadowing global buf_sz
stmmac_rx() declares a local variable named "buf_sz" but there is also a global variable for a module parameter which is called the same. To avoid confusion, rename the local variable.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -3
@@ -5475,10 +5475,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)struct sk_buff *skb =NULL ;struct stmmac_xdp_buff ctx;int xdp_status =0 ; -int buf_sz; +int bufsz; dma_dir =page_pool_get_dma_dir (rx_q->page_pool); - buf_sz =DIV_ROUND_UP (priv->dma_conf.dma_buf_sz,PAGE_SIZE ) *PAGE_SIZE ; + bufsz =DIV_ROUND_UP (priv->dma_conf.dma_buf_sz,PAGE_SIZE ) *PAGE_SIZE ; limit =min (priv->dma_conf.dma_rx_size -1 , (unsigned int )limit);if (netif_msg_rx_status (priv)) {
@@ -5591,7 +5591,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)net_prefetch (page_address (buf->page) + buf->page_offset); -xdp_init_buff (&ctx.xdp, buf_sz, &rx_q->xdp_rxq); +xdp_init_buff (&ctx.xdp, bufsz, &rx_q->xdp_rxq);xdp_prepare_buff (&ctx.xdp,page_address (buf->page), buf->page_offset, buf1_len, true);
Signature · 1 line
2.30.2
Quoted 27 lines · On Wed, 05 Mar 2025 17:54:16 +0000 "Russell King (Oracle)"…
stmmac_rx()declares a local variable named "buf_sz" but there is also a global variable for a module parameter which is called the same. To avoid confusion, rename the local variable.Signed-off-by Russell King (Oracle) <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2
-2@@ -5475,10 +5475,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)struct sk_buff *skb =NULL ;struct stmmac_xdp_buff ctx;int xdp_status =0 ; -int buf_sz; +int bufsz; dma_dir =page_pool_get_dma_dir (rx_q->page_pool); - buf_sz =DIV_ROUND_UP (priv->dma_conf.dma_buf_sz,PAGE_SIZE ) *PAGE_SIZE ; + bufsz =DIV_ROUND_UP (priv->dma_conf.dma_buf_sz,PAGE_SIZE ) *PAGE_SIZE ; limit =min (priv->dma_conf.dma_rx_size -1 , (unsigned int )limit);if (netif_msg_rx_status (priv)) {
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) · line 5597
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -5591,7 +5591,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)net_prefetch (page_address (buf->page) + buf->page_offset); -xdp_init_buff (&ctx.xdp, buf_sz, &rx_q->xdp_rxq); +xdp_init_buff (&ctx.xdp, bufsz, &rx_q->xdp_rxq);xdp_prepare_buff (&ctx.xdp,page_address (buf->page), buf->page_offset, buf1_len, true);
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 05 Mar 2025 17:54:16 +0000 you wrote:
stmmac_rx()declares a local variable named "buf_sz" but there is also a global variable for a module parameter which is called the same. To avoid confusion, rename the local variable.Signed-off-by Russell King (Oracle) <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Here is the summary with links:
- [net-next] net: stmmac: avoid shadowing global buf_sz
https://git.kernel.org/netdev/net-next/c/876cfb20e889
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html