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

Commit 3242c9ee authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-fixes' 



Sergei Shtylyov says:

====================
sh_eth: RX buffer alignment fixes

Here's a set of 2 patches against DaveM's 'net.git' repo which are the
fixes to the RX buffer size calculation.

[1/2] sh_eth: fix RX buffer size alignment
[2/2] sh_eth: fix RX buffer size calculation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f7e1b37e cb368595

drivers/net/ethernet/renesas/sh_eth.c

+7 −7
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;
@@ -1148,8 +1148,8 @@ static void sh_eth_ring_format(struct net_device *ndev) 


		/* RX descriptor */

		rxdesc = &mdp->rx_ring[i];

		/* The size of the buffer is a multiple of 16 bytes. */

		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);

		/* The size of the buffer is a multiple of 32 bytes. */

		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 32);

		dma_addr = dma_map_single(&ndev->dev, skb->data,

					  rxdesc->buffer_length,

					  DMA_FROM_DEVICE);
@@ -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);
@@ -1506,7 +1506,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
			if (mdp->cd->rpadir)

				skb_reserve(skb, NET_IP_ALIGN);

			dma_unmap_single(&ndev->dev, rxdesc->addr,

					 ALIGN(mdp->rx_buf_sz, 16),

					 ALIGN(mdp->rx_buf_sz, 32),

					 DMA_FROM_DEVICE);

			skb_put(skb, pkt_len);

			skb->protocol = eth_type_trans(skb, ndev);
@@ -1524,8 +1524,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
	for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) {

		entry = mdp->dirty_rx % mdp->num_rx_ring;

		rxdesc = &mdp->rx_ring[entry];

		/* The size of the buffer is 16 byte boundary. */

		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);

		/* The size of the buffer is 32 byte boundary. */

		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 32);



		if (mdp->rx_skbuff[entry] == NULL) {

			skb = netdev_alloc_skb(ndev, skbuff_size);