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.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Furong Xu <0x1207@gmail.com>
Link: https://patch.msgid.link/E1tpswi-005U6C-Py@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 7f1421b9983fd8103329a47b5f30d59831ed41a1..767c83b0b2bb48ff954bb17edef276b2caaa360f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5483,10 +5483,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)) {
@@ -5599,7 +5599,7 @@ read_again:
                        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);