Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a0400c3 authored by Iyappan Subramanian's avatar Iyappan Subramanian Committed by David S. Miller
Browse files

drivers: net: xgene: Fix Rx checksum validation logic 



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

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11623fce

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+17 −10
Original line number Diff line number Diff line
@@ -601,15 +601,25 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static void xgene_enet_skip_csum(struct sk_buff *skb)

static void xgene_enet_rx_csum(struct sk_buff *skb)

{

	struct net_device *ndev = skb->dev;

	struct iphdr *iph = ip_hdr(skb);



	if (!ip_is_fragment(iph) ||

	    (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP)) {

	if (!(ndev->features & NETIF_F_RXCSUM))

		return;



	if (skb->protocol != htons(ETH_P_IP))

		return;



	if (ip_is_fragment(iph))

		return;



	if (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP)

		return;



	skb->ip_summed = CHECKSUM_UNNECESSARY;

}

}



static void xgene_enet_free_pagepool(struct xgene_enet_desc_ring *buf_pool,

				     struct xgene_enet_raw_desc *raw_desc,
@@ -729,10 +739,7 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring, 
skip_jumbo:

	skb_checksum_none_assert(skb);

	skb->protocol = eth_type_trans(skb, ndev);

	if (likely((ndev->features & NETIF_F_IP_CSUM) &&

		   skb->protocol == htons(ETH_P_IP))) {

		xgene_enet_skip_csum(skb);

	}

	xgene_enet_rx_csum(skb);



	rx_ring->rx_packets++;

	rx_ring->rx_bytes += datalen;
@@ -2039,7 +2046,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
	xgene_enet_setup_ops(pdata);



	if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {

		ndev->features |= NETIF_F_TSO;

		ndev->features |= NETIF_F_TSO | NETIF_F_RXCSUM;

		spin_lock_init(&pdata->mss_lock);

	}

	ndev->hw_features = ndev->features;