From b91a0dc68f55053889568a5ed7628fcce563f133 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Jul 2008 20:21:42 -0700
Subject: [PATCH] --- yaml --- r: 103567 b: refs/heads/master c:
 a9c19329eccdb145a08a4a2e969d7b40c54c9bcc h: refs/heads/master i:   103565:
 3786bf035bf32f9de4526389944e143e8abbc396   103563:
 fdea303fbcee1860330a7161acef6b02484fe2b9   103559:
 d0b0c3cd7497d93be77128486a48243b6d060ef3   103551:
 70376bb5fe96b40392ba9297195150ff4fe8a94d v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/tcp.h  | 2 +-
 trunk/net/ipv4/af_inet.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47f2da69ab35..83fae64809d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10f84314d5adc0ba6ca2a0877442de63e226130
+refs/heads/master: a9c19329eccdb145a08a4a2e969d7b40c54c9bcc
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 048f8de724c2..b9d0ba618b6b 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/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/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index dc411335c14f..95a966dd1916 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/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;