diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-13 14:43:18 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:23 -0700 |
| commit | 88c7664f13bd1a36acb8566b93892a4c58759ac6 (patch) | |
| tree | 18ead610bf54ef87f3832c61d64a4bad30d4f78e /include/linux | |
| parent | 4bedb45203eab92a87b4c863fe2d0cded633427f (diff) | |
| download | blackbird-op-linux-88c7664f13bd1a36acb8566b93892a4c58759ac6.tar.gz blackbird-op-linux-88c7664f13bd1a36acb8566b93892a4c58759ac6.zip | |
[SK_BUFF]: Introduce icmp_hdr(), remove skb->h.icmph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/icmp.h | 9 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/icmp.h b/include/linux/icmp.h index 24da4fbc1a2f..cd3017a15789 100644 --- a/include/linux/icmp.h +++ b/include/linux/icmp.h @@ -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 */ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index cb1ac48cc808..e580416de78a 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -238,7 +238,6 @@ struct sk_buff { union { struct tcphdr *th; - struct icmphdr *icmph; struct iphdr *ipiph; struct ipv6hdr *ipv6h; unsigned char *raw; |
