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

Commit 590399dd authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller
Browse files

gianfar: Fix Rx byte accounting for ndev stats 



Don't include in the Rx bytecount of the packet sent up the stack:
the FCB (frame control block), and the padding bytes inserted by
the controller into the frame payload, nor the FCS. All these are
being pulled out of the skb by gfar_process_frame().
This issue is old, likely from the driver's beginnings, however
it was amplified by recent:
commit d903ec77 ("gianfar: simplify FCS handling and fix memory leak")
which basically added the FCS to the Rx bytecount, and so brought
this to my attention.

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ca88b54

drivers/net/ethernet/freescale/gianfar.c

+3 −4
Original line number Diff line number Diff line
@@ -3063,9 +3063,6 @@ static void gfar_process_frame(struct net_device *ndev, struct sk_buff *skb) 
	if (ndev->features & NETIF_F_RXCSUM)

		gfar_rx_checksum(skb, fcb);



	/* Tell the skb what kind of packet this is */

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



	/* There's need to check for NETIF_F_HW_VLAN_CTAG_RX here.

	 * Even if vlan rx accel is disabled, on some chips

	 * RXFCB_VLN is pseudo randomly set.
@@ -3136,13 +3133,15 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit) 
			continue;

		}



		gfar_process_frame(ndev, skb);



		/* Increment the number of packets */

		total_pkts++;

		total_bytes += skb->len;



		skb_record_rx_queue(skb, rx_queue->qindex);



		gfar_process_frame(ndev, skb);

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



		/* Send the packet up the stack */

		napi_gro_receive(&rx_queue->grp->napi_rx, skb);