From: Richard Cochran Date: Fri, 30 Aug 2013 18:28:10 +0000 (+0200) Subject: net: fec: fix time stamping logic after napi conversion X-Git-Tag: v3.11~4^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0affdf347ffc0c3a4595661c091e8cc5f1346e92;p=pandora-kernel.git 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 Signed-off-by: David S. Miller --- Reading git-diff-tree failed