tcp: add net to tcp_mib_init

This one sets TCP MIBs after zeroing them, and thus requires
the net.

The existing single caller can use init_net (temporarily).

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 048f8de724c292d15748c7f4a7b7a86f5de11a57..b9d0ba618b6b1069dbe833b118d4b8561c422a38 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1024,7 +1024,7 @@ static inline int tcp_paws_check(const struct tcp_options_received *rx_opt, int
 
 #define TCP_CHECK_TIMER(sk) do { } while (0)
 
-static inline void tcp_mib_init(void)
+static inline void tcp_mib_init(struct net *net)
 {
        /* See RFC 2012 */
        TCP_ADD_STATS_USER(TCP_MIB_RTOALGORITHM, 1);

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index dc411335c14fdb876e0576df3919ad33e25e7615..95a966dd19162d8cd6b4e30d7f51e2793f51aa59 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1363,7 +1363,7 @@ static int __init init_ipv4_mibs(void)
                          sizeof(struct udp_mib)) < 0)
                goto err_udplite_mib;
 
-       tcp_mib_init();
+       tcp_mib_init(&init_net);
 
        return 0;