diff options
| author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2019-01-03 15:59:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-04 21:59:09 +0100 |
| commit | ba3e1847d6471f30241f11069d8f153ed8cb052b (patch) | |
| tree | 66c5eb54f11c4d41c5da76a36c90757d6143e1bf /drivers | |
| parent | net: dsa: microchip: Drop unused GPIO includes (diff) | |
| download | linux-ba3e1847d6471f30241f11069d8f153ed8cb052b.tar.xz linux-ba3e1847d6471f30241f11069d8f153ed8cb052b.zip | |
net: macb: remove unnecessary code
Commit 653e92a9175e ("net: macb: add support for padding and fcs
computation") introduced a bug fixed by commit 899ecaedd155 ("net:
ethernet: cadence: fix socket buffer corruption problem"). Code removed
in this patch is not reachable at all so remove it.
Fixes: 653e92a9175e ("net: macb: add support for padding and fcs computation")
Cc: Tristram Ha <Tristram.Ha@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index b126926ef7f5..66cc7927061a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1738,12 +1738,8 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) *skb = nskb; } - if (padlen) { - if (padlen >= ETH_FCS_LEN) - skb_put_zero(*skb, padlen - ETH_FCS_LEN); - else - skb_trim(*skb, ETH_FCS_LEN - padlen); - } + if (padlen > ETH_FCS_LEN) + skb_put_zero(*skb, padlen - ETH_FCS_LEN); add_fcs: /* set FCS to packet */ |