aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_connection_sock.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-16 23:19:08 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-16 23:19:08 -0400
commit84a3aa000eacbaf841d745b07ef3a3280899056b (patch)
tree013d13bb51e1046f6864ae634edaf0dad30da2e7 /net/ipv4/inet_connection_sock.c
parent78ed11a56bd8679aa6d51eb36b448342c59a7824 (diff)
ipv4: prepare net initialization for IP accounting
Some places, that deal with IP statistics already have where to get a struct net from, but use it directly, without declaring a separate variable on the stack. So, save this net on the stack for future IP_XXX_STATS macros. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r--net/ipv4/inet_connection_sock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 5bbf00051512..8338e1066654 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -338,9 +338,10 @@ struct dst_entry* inet_csk_route_req(struct sock *sk,
338 .uli_u = { .ports = 338 .uli_u = { .ports =
339 { .sport = inet_sk(sk)->sport, 339 { .sport = inet_sk(sk)->sport,
340 .dport = ireq->rmt_port } } }; 340 .dport = ireq->rmt_port } } };
341 struct net *net = sock_net(sk);
341 342
342 security_req_classify_flow(req, &fl); 343 security_req_classify_flow(req, &fl);
343 if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0)) { 344 if (ip_route_output_flow(net, &rt, &fl, sk, 0)) {
344 IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES); 345 IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
345 return NULL; 346 return NULL;
346 } 347 }