From: Alexander Duyck Date: Thu, 4 Sep 2014 17:31:10 +0000 (-0400) Subject: net-timestamp: Merge shared code between phy and regular timestamping X-Git-Tag: fixes-against-v3.18-rc2~81^2~150^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37846ef0188335e49f2491a5bbf4e0dc7d407ea0;p=pandora-kernel.git net-timestamp: Merge shared code between phy and regular timestamping This change merges the shared bits that exist between skb_tx_tstamp and skb_complete_tx_timestamp. By doing this we can avoid the two diverging as there were already changes pushed into skb_tx_tstamp that hadn't made it into the other function. In addition this resolves issues with the fact that skb_complete_tx_timestamp was included in linux/skbuff.h even though it was only compiled in if phy timestamping was enabled. Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller --- Reading git-diff-tree failed