aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-12-25 05:38:40 -0500
committerThomas Gleixner <tglx@linutronix.de>2016-12-25 11:21:22 -0500
commit2456e855354415bfaeb7badaa14e11b3e02c8466 (patch)
tree6fc81500645174c246c3fdb568cba32aa01960c6 /net/core/dev.c
parenta5a1d1c2914b5316924c7893eb683a5420ebd3be (diff)
ktime: Get rid of the union
ktime is a union because the initial implementation stored the time in scalar nanoseconds on 64 bit machine and in a endianess optimized timespec variant for 32bit machines. The Y2038 cleanup removed the timespec variant and switched everything to scalar nanoseconds. The union remained, but become completely pointless. Get rid of the union and just keep ktime_t as simple typedef of type s64. The conversion was done with coccinelle and some manual mopping up. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 037ffd27fcc2..8db5a0b4b520 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1731,14 +1731,14 @@ EXPORT_SYMBOL(net_disable_timestamp);
1731 1731
1732static inline void net_timestamp_set(struct sk_buff *skb) 1732static inline void net_timestamp_set(struct sk_buff *skb)
1733{ 1733{
1734 skb->tstamp.tv64 = 0; 1734 skb->tstamp = 0;
1735 if (static_key_false(&netstamp_needed)) 1735 if (static_key_false(&netstamp_needed))
1736 __net_timestamp(skb); 1736 __net_timestamp(skb);
1737} 1737}
1738 1738
1739#define net_timestamp_check(COND, SKB) \ 1739#define net_timestamp_check(COND, SKB) \
1740 if (static_key_false(&netstamp_needed)) { \ 1740 if (static_key_false(&netstamp_needed)) { \
1741 if ((COND) && !(SKB)->tstamp.tv64) \ 1741 if ((COND) && !(SKB)->tstamp) \
1742 __net_timestamp(SKB); \ 1742 __net_timestamp(SKB); \
1743 } \ 1743 } \
1744 1744