Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Iyappan Subramanian <isubramanian@apm.com>,
        "David S . Miller" <davem@davemloft.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 033/219] drivers: net: xgene: Fix Rx checksum
 validation logic
Thread-Topic: [PATCH AUTOSEL for 4.9 033/219] drivers: net: xgene: Fix Rx
 checksum validation logic
Thread-Index: AQHTsz7raS0p6u5lhkiDa6v4/JTU3Q==
Date:   Sat, 3 Mar 2018 22:28:14 +0000
Message-ID: <20180303222716.26640-33-alexander.levin@microsoft.com>
References: <20180303222716.26640-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303222716.26640-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: ef6fb89a-a2d5-4288-ebcd-08d5815692a2
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:28:14.7912
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Iyappan Subramanian <isubramanian@apm.com>

[ Upstream commit 0a0400c3094b5d5cedd479ddbf1329de74c09c4b ]

This patch fixes Rx checksum validation logic and
adds NETIF_F_RXCSUM flag.

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 27 +++++++++++++++-----=
----
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net=
/ethernet/apm/xgene/xgene_enet_main.c
index de1546a63a7f..651f308cdc60 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -505,14 +505,24 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_bu=
ff *skb,
 	return NETDEV_TX_OK;
 }
=20
-static void xgene_enet_skip_csum(struct sk_buff *skb)
+static void xgene_enet_rx_csum(struct sk_buff *skb)
 {
+	struct net_device *ndev =3D skb->dev;
 	struct iphdr *iph =3D ip_hdr(skb);
=20
-	if (!ip_is_fragment(iph) ||
-	    (iph->protocol !=3D IPPROTO_TCP && iph->protocol !=3D IPPROTO_UDP)) {
-		skb->ip_summed =3D CHECKSUM_UNNECESSARY;
-	}
+	if (!(ndev->features & NETIF_F_RXCSUM))
+		return;
+
+	if (skb->protocol !=3D htons(ETH_P_IP))
+		return;
+
+	if (ip_is_fragment(iph))
+		return;
+
+	if (iph->protocol !=3D IPPROTO_TCP && iph->protocol !=3D IPPROTO_UDP)
+		return;
+
+	skb->ip_summed =3D CHECKSUM_UNNECESSARY;
 }
=20
 static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
@@ -555,10 +565,7 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_=
ring *rx_ring,
=20
 	skb_checksum_none_assert(skb);
 	skb->protocol =3D eth_type_trans(skb, ndev);
-	if (likely((ndev->features & NETIF_F_IP_CSUM) &&
-		   skb->protocol =3D=3D htons(ETH_P_IP))) {
-		xgene_enet_skip_csum(skb);
-	}
+	xgene_enet_rx_csum(skb);
=20
 	rx_ring->rx_packets++;
 	rx_ring->rx_bytes +=3D datalen;
@@ -1725,7 +1732,7 @@ static int xgene_enet_probe(struct platform_device *p=
dev)
 	xgene_enet_setup_ops(pdata);
=20
 	if (pdata->phy_mode =3D=3D PHY_INTERFACE_MODE_XGMII) {
-		ndev->features |=3D NETIF_F_TSO;
+		ndev->features |=3D NETIF_F_TSO | NETIF_F_RXCSUM;
 		spin_lock_init(&pdata->mss_lock);
 	}
 	ndev->hw_features =3D ndev->features;
--=20
2.14.1