Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb368595 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab857916

drivers/net/ethernet/renesas/sh_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ static void sh_eth_ring_format(struct net_device *ndev) 
	struct sh_eth_txdesc *txdesc = NULL;

	int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring;

	int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring;

	int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN - 1;

	int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1;

	dma_addr_t dma_addr;



	mdp->cur_rx = 0;
@@ -1450,7 +1450,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
	struct sk_buff *skb;

	u16 pkt_len = 0;

	u32 desc_status;

	int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN - 1;

	int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1;

	dma_addr_t dma_addr;



	boguscnt = min(boguscnt, *quota);