diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2015-03-03 01:53:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-03 03:30:56 +0100 |
| commit | dacc73e0cf930e87e2e6a94d29156f1d5776b18f (patch) | |
| tree | 3499adf3aa71c7c60806d715a7fc84828bd83cdf /drivers/net/ethernet/renesas/sh_eth.c | |
| parent | Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790" (diff) | |
| download | linux-dacc73e0cf930e87e2e6a94d29156f1d5776b18f.tar.xz linux-dacc73e0cf930e87e2e6a94d29156f1d5776b18f.zip | |
sh_eth: Really fix padding of short frames on TX
My previous fix to clear padding of short frames used skb->len as the
DMA length, assuming that skb_padto() extended skb->len to include the
padding. That isn't the case; we need to use skb_put_padto() instead.
(This wasn't immediately obvious because software padding isn't
actually needed on the R-Car H2. We could make it conditional on
which chip is being driven, but it's probably not worth the effort.)
Reported-by: "Violeta Menéndez González" <violeta.menendez@codethink.co.uk>
Fixes: 612a17a54b50 ("sh_eth: Fix padding of short frames on TX")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 3406cda57a45..736d5d1624a1 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2181,7 +2181,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) } spin_unlock_irqrestore(&mdp->lock, flags); - if (skb_padto(skb, ETH_ZLEN)) + if (skb_put_padto(skb, ETH_ZLEN)) return NETDEV_TX_OK; entry = mdp->cur_tx % mdp->num_tx_ring; |