Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0388b004 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61362766

include/net/icmp.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/ip_output.c

+2 −1
Original line number Diff line number Diff line
@@ -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. */

net/ipv4/raw.c

+2 −1
Original line number Diff line number Diff line
@@ -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,