Commit 876cfb20 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFurong Xu <0x1207@gmail.com>
Link: https://patch.msgid.link/E1tpswi-005U6C-Py@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 56a58696

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ 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);