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

Commit 094e43d5 authored by Kazuya Mizuguchi's avatar Kazuya Mizuguchi Committed by David S. Miller
Browse files

ravb: Remove rx buffer ALIGN 



Aligning the reception data size is not required.

Signed-off-by: default avatarKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: default avatarYoshihiro Kaneko <ykaneko0929@gmail.com>
Tested-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ede00a5c

drivers/net/ethernet/renesas/ravb_main.c

+4 −6
Original line number Diff line number Diff line
@@ -246,10 +246,9 @@ static void ravb_ring_format(struct net_device *ndev, int q) 
	for (i = 0; i < priv->num_rx_ring[q]; i++) {

		/* RX descriptor */

		rx_desc = &priv->rx_ring[q][i];

		/* The size of the buffer should be on 16-byte boundary. */

		rx_desc->ds_cc = cpu_to_le16(ALIGN(PKT_BUF_SZ, 16));

		rx_desc->ds_cc = cpu_to_le16(PKT_BUF_SZ);

		dma_addr = dma_map_single(ndev->dev.parent, priv->rx_skb[q][i]->data,

					  ALIGN(PKT_BUF_SZ, 16),

					  PKT_BUF_SZ,

					  DMA_FROM_DEVICE);

		/* We just set the data size to 0 for a failed mapping which

		 * should prevent DMA from happening...
@@ -558,7 +557,7 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) 
			skb = priv->rx_skb[q][entry];

			priv->rx_skb[q][entry] = NULL;

			dma_unmap_single(ndev->dev.parent, le32_to_cpu(desc->dptr),

					 ALIGN(PKT_BUF_SZ, 16),

					 PKT_BUF_SZ,

					 DMA_FROM_DEVICE);

			get_ts &= (q == RAVB_NC) ?

					RAVB_RXTSTAMP_TYPE_V2_L2_EVENT :
@@ -588,8 +587,7 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) 
	for (; priv->cur_rx[q] - priv->dirty_rx[q] > 0; priv->dirty_rx[q]++) {

		entry = priv->dirty_rx[q] % priv->num_rx_ring[q];

		desc = &priv->rx_ring[q][entry];

		/* The size of the buffer should be on 16-byte boundary. */

		desc->ds_cc = cpu_to_le16(ALIGN(PKT_BUF_SZ, 16));

		desc->ds_cc = cpu_to_le16(PKT_BUF_SZ);



		if (!priv->rx_skb[q][entry]) {

			skb = netdev_alloc_skb(ndev,