提交 0affdf34 编写于 作者: R Richard Cochran 提交者: David S. Miller

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: NRichard Cochran <richardcochran@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 2d98c29b
...@@ -971,8 +971,7 @@ fec_enet_rx(struct net_device *ndev, int budget) ...@@ -971,8 +971,7 @@ fec_enet_rx(struct net_device *ndev, int budget)
htons(ETH_P_8021Q), htons(ETH_P_8021Q),
vlan_tag); 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, bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册