[PATCH net] net: fec: fix time stamping logic after napi conversion

[PATCH net] net: fec: fix time stamping logic after napi conversion

[Richard Cochran]

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>
---
 drivers/net/ethernet/freescale/fec_main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 77ea0db..c610a27 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -971,8 +971,7 @@ 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);
+			napi_gro_receive(&fep->napi, skb);
 		}
 
 		bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
-- 
1.7.10.4

Re: [PATCH net] net: fec: fix time stamping logic after napi conversion

[David Miller]

From: Richard Cochran <richardcochran@gmail.com>
Date: Fri, 30 Aug 2013 20:28:10 +0200

> 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>

Applied and queued up for -stable, thanks!