diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2013-08-30 18:28:10 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-30 22:01:19 (GMT) |
| commit | 0affdf347ffc0c3a4595661c091e8cc5f1346e92 (patch) | |
| tree | b806ac76a25611a706a325af1be8fc4b9ba9e7f7 /drivers/net/ethernet | |
| parent | 2d98c29b6fb3de44d9eaa73c09f9cf7209346383 (diff) | |
| download | linux-fsl-qoriq-0affdf347ffc0c3a4595661c091e8cc5f1346e92.tar.xz | |
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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 3 |
1 files changed, 1 insertions, 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, |