diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-04-17 09:49:39 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-17 23:20:25 -0700 |
| commit | f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2 (patch) | |
| tree | 923f56a381c263d8b8082f9712b50ba229f8ec41 /drivers | |
| parent | 19fad20d15a6494f47f85d869f00b11343ee5c78 (diff) | |
| download | linux-stable-f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2.tar.gz linux-stable-f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2.tar.bz2 linux-stable-f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2.zip | |
net: stmmac: Use bfsize1 in ndesc_init_rx_desc
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c index b7dd4e3c760d..6d690678c20e 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); |