Message ID | 20190417014939.36656-1-yuehaibing@huawei.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net: stmmac: Use bfsize1 in ndesc_init_rx_desc | expand |
Hi, From: Yue Haibing [yuehaibing@huawei.com] > gcc warn this: > > drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In function ndesc_init_rx_desc: > drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable] > > Like enh_desc_init_rx_desc, we should use bfsize1 > in ndesc_init_rx_desc to calculate 'p->des1' > > Fixes: 583e63614149 ("net: stmmac: use correct DMA buffer size in the RX descriptor") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com> Thanks, looks like GCC 6.3.0 missed this. A.
From: Yue Haibing <yuehaibing@huawei.com> Date: Wed, 17 Apr 2019 09:49:39 +0800 > From: YueHaibing <yuehaibing@huawei.com> > > gcc warn this: > > drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In function ndesc_init_rx_desc: > drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable] > > Like enh_desc_init_rx_desc, we should use bfsize1 > in ndesc_init_rx_desc to calculate 'p->des1' > > Fixes: 583e63614149 ("net: stmmac: use correct DMA buffer size in the RX descriptor") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied, thank you.
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c index b7dd4e3..6d69067 100644 --- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c +++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c @@ -140,7 +140,7 @@ static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode, p->des0 |= cpu_to_le32(RDES0_OWN); bfsize1 = min(bfsize, BUF_SIZE_2KiB - 1); - p->des1 |= cpu_to_le32(bfsize & RDES1_BUFFER1_SIZE_MASK); + p->des1 |= cpu_to_le32(bfsize1 & RDES1_BUFFER1_SIZE_MASK); if (mode == STMMAC_CHAIN_MODE) ndesc_rx_set_on_chain(p, end);