summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-18 04:02:08 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-18 04:02:08 -0700
commit57ef42d59d1c1d79be59fc3c6380ae14234e38c3 (patch)
tree4ccc2166f6967ac1fb582715f7d7d5bb5c9205fc /net/ipv4/af_inet.c
parent9b4661bd6e5437508e0920608f3213c23212cd1b (diff)
downloadop-kernel-dev-57ef42d59d1c1d79be59fc3c6380ae14234e38c3.zip
op-kernel-dev-57ef42d59d1c1d79be59fc3c6380ae14234e38c3.tar.gz
mib: put tcp statistics on struct net
Proc temporary uses stats from init_net. BTW, TCP_XXX_STATS are beautiful (w/o do { } while (0) facing) again :) Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index b4b77aa..c1a3e98 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1342,11 +1342,20 @@ static struct net_protocol icmp_protocol = {
static __net_init int ipv4_mib_init_net(struct net *net)
{
+ if (snmp_mib_init((void **)net->mib.tcp_statistics,
+ sizeof(struct tcp_mib)) < 0)
+ goto err_tcp_mib;
+
+ tcp_mib_init(net);
return 0;
+
+err_tcp_mib:
+ return -ENOMEM;
}
static __net_exit void ipv4_mib_exit_net(struct net *net)
{
+ snmp_mib_free((void **)net->mib.tcp_statistics);
}
static __net_initdata struct pernet_operations ipv4_mib_ops = {
@@ -1368,9 +1377,6 @@ static int __init init_ipv4_mibs(void)
if (snmp_mib_init((void **)icmpmsg_statistics,
sizeof(struct icmpmsg_mib)) < 0)
goto err_icmpmsg_mib;
- if (snmp_mib_init((void **)tcp_statistics,
- sizeof(struct tcp_mib)) < 0)
- goto err_tcp_mib;
if (snmp_mib_init((void **)udp_statistics,
sizeof(struct udp_mib)) < 0)
goto err_udp_mib;
@@ -1378,8 +1384,6 @@ static int __init init_ipv4_mibs(void)
sizeof(struct udp_mib)) < 0)
goto err_udplite_mib;
- tcp_mib_init(&init_net);
-
if (register_pernet_subsys(&ipv4_mib_ops))
goto err_net;
@@ -1390,8 +1394,6 @@ err_net:
err_udplite_mib:
snmp_mib_free((void **)udp_statistics);
err_udp_mib:
- snmp_mib_free((void **)tcp_statistics);
-err_tcp_mib:
snmp_mib_free((void **)icmpmsg_statistics);
err_icmpmsg_mib:
snmp_mib_free((void **)icmp_statistics);
OpenPOWER on IntegriCloud