Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / syncookies.c

diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 7bf3cc427c28c63f71b8495be54b2138bfbb3359..bb46061c813a45c1ef859f5c60c2c5e45773ed29 100644 (file)
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -177,7 +177,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 
        /* check for timestamp cookie support */
        memset(&tcp_opt, 0, sizeof(tcp_opt));
-       tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+       tcp_parse_options(skb, &tcp_opt, &hash_location, 0, NULL);
 
        if (!cookie_check_timestamp(&tcp_opt, &ecn_ok))
                goto out;