diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-10-23 17:46:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-26 21:32:16 -0400 |
commit | cb3685958dd4c46d7646d244063ea3ec8adf3618 (patch) | |
tree | 16eda86dd6615678d8a9c9ee6784fabc6d1460e5 | |
parent | ab8579169b79c062935dade949287113c7c1ba73 (diff) |
sh_eth: fix RX buffer size calculation
The RX buffer size calulation failed to account for the length granularity
(which is now 32 bytes)...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index d8334d8a53b3..a484d8beb855 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -1127,7 +1127,7 @@ static void sh_eth_ring_format(struct net_device *ndev) | |||
1127 | struct sh_eth_txdesc *txdesc = NULL; | 1127 | struct sh_eth_txdesc *txdesc = NULL; |
1128 | int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring; | 1128 | int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring; |
1129 | int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring; | 1129 | int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring; |
1130 | int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN - 1; | 1130 | int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1; |
1131 | dma_addr_t dma_addr; | 1131 | dma_addr_t dma_addr; |
1132 | 1132 | ||
1133 | mdp->cur_rx = 0; | 1133 | mdp->cur_rx = 0; |
@@ -1450,7 +1450,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) | |||
1450 | struct sk_buff *skb; | 1450 | struct sk_buff *skb; |
1451 | u16 pkt_len = 0; | 1451 | u16 pkt_len = 0; |
1452 | u32 desc_status; | 1452 | u32 desc_status; |
1453 | int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN - 1; | 1453 | int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1; |
1454 | dma_addr_t dma_addr; | 1454 | dma_addr_t dma_addr; |
1455 | 1455 | ||
1456 | boguscnt = min(boguscnt, *quota); | 1456 | boguscnt = min(boguscnt, *quota); |