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

Commit 450fa219 authored by Mitsuhiro Kimura's avatar Mitsuhiro Kimura Committed by David S. Miller
Browse files

sh_eth: Remove redundant alignment adjustment



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>
parent 319cd520
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -1142,7 +1142,7 @@ static void sh_eth_ring_format(struct net_device *ndev)


		/* RX descriptor */
		/* RX descriptor */
		rxdesc = &mdp->rx_ring[i];
		rxdesc = &mdp->rx_ring[i];
		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);
		rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);


		/* The size of the buffer is 16 byte boundary. */
		/* The size of the buffer is 16 byte boundary. */
@@ -1476,7 +1476,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
			sh_eth_set_receive_align(skb);
			sh_eth_set_receive_align(skb);


			skb_checksum_none_assert(skb);
			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)
		if (entry >= mdp->num_rx_ring - 1)
			rxdesc->status |=
			rxdesc->status |=