diff mbox series

net: macb: remove unnecessary code

Message ID 1546527547-10262-1-git-send-email-claudiu.beznea@microchip.com
State Accepted
Delegated to: David Miller
Headers show
Series net: macb: remove unnecessary code | expand

Commit Message

Claudiu Beznea Jan. 3, 2019, 2:59 p.m. UTC 
From: Claudiu Beznea <claudiu.beznea@microchip.com>

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>
---
 drivers/net/ethernet/cadence/macb_main.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

David Miller Jan. 4, 2019, 9 p.m. UTC | #1 
From: <Claudiu.Beznea@microchip.com>
Date: Thu, 3 Jan 2019 14:59:35 +0000

> From: Claudiu Beznea <claudiu.beznea@microchip.com>
> 
> 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>

Applied.
diff mbox series

Patch

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 */