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>

diff --git a/include/net/icmp.h b/include/net/icmp.h
index dddb839..38ca2f3 100644 (file)
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -44,12 +44,13 @@ DECLARE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
 struct dst_entry;
 struct net_proto_family;
 struct sk_buff;
+struct net;
 
 extern void    icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int     icmp_rcv(struct sk_buff *skb);
 extern int     icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int     icmp_init(void);
-extern void    icmp_out_count(unsigned char type);
+extern void    icmp_out_count(struct net *net, unsigned char type);
 
 /* Move into dst.h ? */
 extern int     xrlim_allow(struct dst_entry *dst, int timeout);

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index aa7cf46..1ffe7ad 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -296,7 +296,7 @@ out:
 /*
  *     Maintain the counters used in the SNMP statistics for outgoing ICMP
  */
-void icmp_out_count(unsigned char type)
+void icmp_out_count(struct net *net, unsigned char type)
 {
        ICMPMSGOUT_INC_STATS(type);
        ICMP_INC_STATS(ICMP_MIB_OUTMSGS);

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index f1278ee..f003186 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1211,6 +1211,7 @@ int ip_push_pending_frames(struct sock *sk)
        struct sk_buff *skb, *tmp_skb;
        struct sk_buff **tail_skb;
        struct inet_sock *inet = inet_sk(sk);
+       struct net *net = sock_net(sk);
        struct ip_options *opt = NULL;
        struct rtable *rt = (struct rtable *)inet->cork.dst;
        struct iphdr *iph;
@@ -1280,7 +1281,7 @@ int ip_push_pending_frames(struct sock *sk)
        skb->dst = dst_clone(&rt->u.dst);
 
        if (iph->protocol == IPPROTO_ICMP)
-               icmp_out_count(((struct icmphdr *)
+               icmp_out_count(net, ((struct icmphdr *)
                        skb_transport_header(skb))->type);
 
        /* Netfilter gets whole the not fragmented skb. */

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 925fdf1..7f39ea4 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -320,6 +320,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
                        unsigned int flags)
 {
        struct inet_sock *inet = inet_sk(sk);
+       struct net *net = sock_net(sk);
        struct iphdr *iph;
        struct sk_buff *skb;
        unsigned int iphlen;
@@ -368,7 +369,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
                iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
        }
        if (iph->protocol == IPPROTO_ICMP)
-               icmp_out_count(((struct icmphdr *)
+               icmp_out_count(net, ((struct icmphdr *)
                        skb_transport_header(skb))->type);
 
        err = NF_HOOK(PF_INET, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,