diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-16 23:21:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-16 23:21:42 -0400 |
commit | a9c19329eccdb145a08a4a2e969d7b40c54c9bcc (patch) | |
tree | 3cee2cdcdb0270fcd5e7765cdb4e8b5882afecb0 | |
parent | f10f84314d5adc0ba6ca2a0877442de63e226130 (diff) |
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.h | 2 | ||||
-rw-r--r-- | net/ipv4/af_inet.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 048f8de724c2..b9d0ba618b6b 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 | |||
1024 | 1024 | ||
1025 | #define TCP_CHECK_TIMER(sk) do { } while (0) | 1025 | #define TCP_CHECK_TIMER(sk) do { } while (0) |
1026 | 1026 | ||
1027 | static inline void tcp_mib_init(void) | 1027 | static inline void tcp_mib_init(struct net *net) |
1028 | { | 1028 | { |
1029 | /* See RFC 2012 */ | 1029 | /* See RFC 2012 */ |
1030 | TCP_ADD_STATS_USER(TCP_MIB_RTOALGORITHM, 1); | 1030 | TCP_ADD_STATS_USER(TCP_MIB_RTOALGORITHM, 1); |
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index dc411335c14f..95a966dd1916 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1363,7 +1363,7 @@ static int __init init_ipv4_mibs(void) | |||
1363 | sizeof(struct udp_mib)) < 0) | 1363 | sizeof(struct udp_mib)) < 0) |
1364 | goto err_udplite_mib; | 1364 | goto err_udplite_mib; |
1365 | 1365 | ||
1366 | tcp_mib_init(); | 1366 | tcp_mib_init(&init_net); |
1367 | 1367 | ||
1368 | return 0; | 1368 | return 0; |
1369 | 1369 | ||