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;