Commit 88c7664f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Introduce icmp_hdr(), remove skb->h.icmph 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4bedb452

include/linux/icmp.h

+9 −0
Original line number Diff line number Diff line
@@ -82,6 +82,15 @@ struct icmphdr { 
  } un;

};



#ifdef __KERNEL__

#include <linux/skbuff.h>



static inline struct icmphdr *icmp_hdr(const struct sk_buff *skb)

{

	return (struct icmphdr *)skb->h.raw;

}

#endif



/*

 *	constants for (set|get)sockopt

 */

include/linux/skbuff.h

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ struct sk_buff { 


	union {

		struct tcphdr	*th;

		struct icmphdr	*icmph;

		struct iphdr	*ipiph;

		struct ipv6hdr	*ipv6h;

		unsigned char	*raw;

net/dccp/ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
							(iph->ihl << 2));

	struct dccp_sock *dp;

	struct inet_sock *inet;

	const int type = skb->h.icmph->type;

	const int code = skb->h.icmph->code;

	const int type = icmp_hdr(skb)->type;

	const int code = icmp_hdr(skb)->code;

	struct sock *sk;

	__u64 seq;

	int err;

net/ipv4/ah4.c

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ static void ah4_err(struct sk_buff *skb, u32 info) 
	struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+(iph->ihl<<2));

	struct xfrm_state *x;



	if (skb->h.icmph->type != ICMP_DEST_UNREACH ||

	    skb->h.icmph->code != ICMP_FRAG_NEEDED)

	if (icmp_hdr(skb)->type != ICMP_DEST_UNREACH ||

	    icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)

		return;



	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);

net/ipv4/esp4.c

+2 −2
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ static void esp4_err(struct sk_buff *skb, u32 info) 
	struct ip_esp_hdr *esph = (struct ip_esp_hdr*)(skb->data+(iph->ihl<<2));

	struct xfrm_state *x;



	if (skb->h.icmph->type != ICMP_DEST_UNREACH ||

	    skb->h.icmph->code != ICMP_FRAG_NEEDED)

	if (icmp_hdr(skb)->type != ICMP_DEST_UNREACH ||

	    icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)

		return;



	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);