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

Commit db111b75 authored by Mitsuhiro Kimura's avatar Mitsuhiro Kimura Committed by Sasha Levin
Browse files

sh_eth: Remove redundant alignment adjustment 



[ Upstream commit 450fa21942fe2c37f0c9f52d1a33bbc081eee288 ]

PTR_ALIGN macro after skb_reserve is redundant, because skb_reserve
function adjusts the alignment of skb->data.

Signed-off-by: default avatarMitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>
Signed-off-by: default avatarYoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 2ccbc42c

drivers/net/ethernet/renesas/sh_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ static void sh_eth_ring_format(struct net_device *ndev) 
		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);

		dma_map_single(&ndev->dev, skb->data, rxdesc->buffer_length,

			       DMA_FROM_DEVICE);

		rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));

		rxdesc->addr = virt_to_phys(skb->data);

		rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);



		/* Rx descriptor address set */
@@ -1472,7 +1472,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
				       rxdesc->buffer_length, DMA_FROM_DEVICE);



			skb_checksum_none_assert(skb);

			rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));

			rxdesc->addr = virt_to_phys(skb->data);

		}

		if (entry >= mdp->num_rx_ring - 1)

			rxdesc->status |=