Commit 0affdf34 authored Aug 30, 2013 by Richard Cochran Committed by David S. Miller Aug 30, 2013

net: fec: fix time stamping logic after napi conversion



Commit dc975382 "net: fec: add napi support to improve proformance"
converted the fec driver to the napi model. However, that commit
forgot to remove the call to skb_defer_rx_timestamp which is only
needed in non-napi drivers.

(The function napi_gro_receive eventually calls netif_receive_skb,
which in turn calls skb_defer_rx_timestamp.)

This patch should also be applied to the 3.9 and 3.10 kernels.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2d98c29b

drivers/net/ethernet/freescale/fec_main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -971,7 +971,6 @@ fec_enet_rx(struct net_device *ndev, int budget)
		htons(ETH_P_8021Q),
		vlan_tag);

		if (!skb_defer_rx_timestamp(skb))
		napi_gro_receive(&fep->napi, skb);
		}