summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-16 20:21:42 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-16 20:21:42 -0700
commita9c19329eccdb145a08a4a2e969d7b40c54c9bcc (patch)
tree3cee2cdcdb0270fcd5e7765cdb4e8b5882afecb0
parentf10f84314d5adc0ba6ca2a0877442de63e226130 (diff)
downloadlinux-3.10-a9c19329eccdb145a08a4a2e969d7b40c54c9bcc.tar.gz
linux-3.10-a9c19329eccdb145a08a4a2e969d7b40c54c9bcc.tar.bz2
linux-3.10-a9c19329eccdb145a08a4a2e969d7b40c54c9bcc.zip
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>
-rw-r--r--include/net/tcp.h2
-rw-r--r--net/ipv4/af_inet.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 048f8de724c..b9d0ba618b6 100644
--- 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 dc411335c14..95a966dd191 100644
--- 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;