summaryrefslogtreecommitdiff
path: root/mm/nobootmem.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2014-09-04 17:31:10 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-09-06 00:43:45 (GMT)
commit37846ef0188335e49f2491a5bbf4e0dc7d407ea0 (patch)
tree29679300ee05829ae912b9af2eb05a3f96094b26 /mm/nobootmem.c
parentd546c621542df9e45eedc91f35356e887ac63b7b (diff)
downloadlinux-37846ef0188335e49f2491a5bbf4e0dc7d407ea0.tar.xz
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 <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/nobootmem.c')
0 files changed, 0 insertions, 0 deletions