aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-08-22 21:32:09 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-22 22:57:23 -0400
commitd2de875c6d4cbec8a99c880160181a3ed5b9992e (patch)
tree5dc09deacccbd946bc7f6b602c1b788fcdf842a6 /net/core
parent3f8a2b746e3aece61f9c4714b86d1484d66461f0 (diff)
net: use ktime_get_ns() and ktime_get_real_ns() helpers
ktime_get_ns() replaces ktime_to_ns(ktime_get()) ktime_get_real_ns() replaces ktime_to_ns(ktime_get_real()) Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/secure_seq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
index ba71212f0251..51dd3193a33e 100644
--- a/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@ -35,7 +35,7 @@ static u32 seq_scale(u32 seq)
35 * overlaps less than one time per MSL (2 minutes). 35 * overlaps less than one time per MSL (2 minutes).
36 * Choosing a clock of 64 ns period is OK. (period of 274 s) 36 * Choosing a clock of 64 ns period is OK. (period of 274 s)
37 */ 37 */
38 return seq + (ktime_to_ns(ktime_get_real()) >> 6); 38 return seq + (ktime_get_real_ns() >> 6);
39} 39}
40#endif 40#endif
41 41
@@ -135,7 +135,7 @@ u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
135 md5_transform(hash, net_secret); 135 md5_transform(hash, net_secret);
136 136
137 seq = hash[0] | (((u64)hash[1]) << 32); 137 seq = hash[0] | (((u64)hash[1]) << 32);
138 seq += ktime_to_ns(ktime_get_real()); 138 seq += ktime_get_real_ns();
139 seq &= (1ull << 48) - 1; 139 seq &= (1ull << 48) - 1;
140 140
141 return seq; 141 return seq;
@@ -163,7 +163,7 @@ u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
163 md5_transform(hash, secret); 163 md5_transform(hash, secret);
164 164
165 seq = hash[0] | (((u64)hash[1]) << 32); 165 seq = hash[0] | (((u64)hash[1]) << 32);
166 seq += ktime_to_ns(ktime_get_real()); 166 seq += ktime_get_real_ns();
167 seq &= (1ull << 48) - 1; 167 seq &= (1ull << 48) - 1;
168 168
169 return seq; 169 return seq;