From: Jakub Kicinski Date: Sat, 15 Mar 2014 14:55:16 +0000 (+0000) Subject: ixgbe: never generate both software and hardware timestamps X-Git-Tag: v3.15-rc1~113^2~16^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff29a86ec9143ff1aa1901ae60f06f4980981df4;p=pandora-kernel.git ixgbe: never generate both software and hardware timestamps skb_tx_timestamp() does not report software time stamp if SKBTX_IN_PROGRESS is set. According to timestamping.txt software time stamps are a fallback and should not be generated if hardware time stamp is provided. Move call to skb_tx_timestamp() after setting SKBTX_IN_PROGRESS. Signed-off-by: Jakub Kicinski Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- Reading git-diff-tree failed