diff options
author | Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com> | 2014-12-08 05:46:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-09 18:05:08 -0500 |
commit | 450fa21942fe2c37f0c9f52d1a33bbc081eee288 (patch) | |
tree | ffb15f5ed34a175e84ba59a02d28baf7081a087a /drivers/net/ethernet | |
parent | 319cd52013dec3413a3b753f7b7747504aa077df (diff) |
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: Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index e77025915b23..ad2e285aefd4 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -1142,7 +1142,7 @@ static void sh_eth_ring_format(struct net_device *ndev) | |||
1142 | 1142 | ||
1143 | /* RX descriptor */ | 1143 | /* RX descriptor */ |
1144 | rxdesc = &mdp->rx_ring[i]; | 1144 | rxdesc = &mdp->rx_ring[i]; |
1145 | rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4)); | 1145 | rxdesc->addr = virt_to_phys(skb->data); |
1146 | rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP); | 1146 | rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP); |
1147 | 1147 | ||
1148 | /* The size of the buffer is 16 byte boundary. */ | 1148 | /* 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) | |||
1476 | sh_eth_set_receive_align(skb); | 1476 | sh_eth_set_receive_align(skb); |
1477 | 1477 | ||
1478 | skb_checksum_none_assert(skb); | 1478 | skb_checksum_none_assert(skb); |
1479 | rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4)); | 1479 | rxdesc->addr = virt_to_phys(skb->data); |
1480 | } | 1480 | } |
1481 | if (entry >= mdp->num_rx_ring - 1) | 1481 | if (entry >= mdp->num_rx_ring - 1) |
1482 | rxdesc->status |= | 1482 | rxdesc->status |= |