Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux.git] / net / ipv4 / syncookies.c

diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 535b69326f66aa0733d8a443f1083a997f9683f2..345b2b0ff618509bc50e244c2ab44c0bbdfbba3e 100644 (file)
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -62,10 +62,10 @@ static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport,
  * Since subsequent timestamps use the normal tcp_time_stamp value, we
  * must make sure that the resulting initial timestamp is <= tcp_time_stamp.
  */
-u64 cookie_init_timestamp(struct request_sock *req)
+u64 cookie_init_timestamp(struct request_sock *req, u64 now)
 {
        struct inet_request_sock *ireq;
-       u32 ts, ts_now = tcp_time_stamp_raw();
+       u32 ts, ts_now = tcp_ns_to_ts(now);
        u32 options = 0;
 
        ireq = inet_rsk(req);