From: Tristram Ha <Tristram.Ha@microchip.com>
Date: Wed, 24 Oct 2018 21:51:23 +0000 (-0700)
Subject: net: ethernet: cadence: fix socket buffer corruption problem
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=899ecaedd155;p=linux.git

net: ethernet: cadence: fix socket buffer corruption problem

Socket buffer is not re-created when headroom is 2 and tailroom is 1.

Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 8f5bf9166c11a..1d86b4d5645ad 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1684,7 +1684,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
 			padlen = 0;
 		/* No room for FCS, need to reallocate skb. */
 		else
-			padlen = ETH_FCS_LEN - tailroom;
+			padlen = ETH_FCS_LEN;
 	} else {
 		/* Add room for FCS. */
 		padlen += ETH_FCS_LEN;