aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-15 02:00:43 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-15 02:05:13 -0400
commit0388b0042624714e6f8db8cc7994101a0a02d392 (patch)
tree597834169ca3cab001e2ad3094590c1c076e3736 /net/ipv4/ip_output.c
parent61362766d769c934a9d12d5516323c544c161908 (diff)
icmp: add struct net argument to icmp_out_count
This routine deals with ICMP statistics, but doesn't have a struct net at hands, so add one. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index f1278eecf56d..f003186b93b1 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1211,6 +1211,7 @@ int ip_push_pending_frames(struct sock *sk)
1211 struct sk_buff *skb, *tmp_skb; 1211 struct sk_buff *skb, *tmp_skb;
1212 struct sk_buff **tail_skb; 1212 struct sk_buff **tail_skb;
1213 struct inet_sock *inet = inet_sk(sk); 1213 struct inet_sock *inet = inet_sk(sk);
1214 struct net *net = sock_net(sk);
1214 struct ip_options *opt = NULL; 1215 struct ip_options *opt = NULL;
1215 struct rtable *rt = (struct rtable *)inet->cork.dst; 1216 struct rtable *rt = (struct rtable *)inet->cork.dst;
1216 struct iphdr *iph; 1217 struct iphdr *iph;
@@ -1280,7 +1281,7 @@ int ip_push_pending_frames(struct sock *sk)
1280 skb->dst = dst_clone(&rt->u.dst); 1281 skb->dst = dst_clone(&rt->u.dst);
1281 1282
1282 if (iph->protocol == IPPROTO_ICMP) 1283 if (iph->protocol == IPPROTO_ICMP)
1283 icmp_out_count(((struct icmphdr *) 1284 icmp_out_count(net, ((struct icmphdr *)
1284 skb_transport_header(skb))->type); 1285 skb_transport_header(skb))->type);
1285 1286
1286 /* Netfilter gets whole the not fragmented skb. */ 1287 /* Netfilter gets whole the not fragmented skb. */