Merge remote branch 'wireless-next/master' into ath6kl-next

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bb485fcb077ef0cf290ce04423b24021190cf4c0..3ba605f60e4e18b0b83cfc882cf8fd9ed39569f3 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3514,6 +3514,7 @@ void __init tcp_init(void)
                                        0,
                                        NULL,
                                        &tcp_hashinfo.ehash_mask,
+                                       0,
                                        thash_entries ? 0 : 512 * 1024);
        for (i = 0; i <= tcp_hashinfo.ehash_mask; i++) {
                INIT_HLIST_NULLS_HEAD(&tcp_hashinfo.ehash[i].chain, i);
@@ -3530,6 +3531,7 @@ void __init tcp_init(void)
                                        0,
                                        &tcp_hashinfo.bhash_size,
                                        NULL,
+                                       0,
                                        64 * 1024);
        tcp_hashinfo.bhash_size = 1U << tcp_hashinfo.bhash_size;
        for (i = 0; i < tcp_hashinfo.bhash_size; i++) {