summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-13 14:43:18 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:25:23 -0700
commit88c7664f13bd1a36acb8566b93892a4c58759ac6 (patch)
tree18ead610bf54ef87f3832c61d64a4bad30d4f78e /include/linux
parent4bedb45203eab92a87b4c863fe2d0cded633427f (diff)
downloadop-kernel-dev-88c7664f13bd1a36acb8566b93892a4c58759ac6.zip
op-kernel-dev-88c7664f13bd1a36acb8566b93892a4c58759ac6.tar.gz
[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.h9
-rw-r--r--include/linux/skbuff.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/icmp.h b/include/linux/icmp.h
index 24da4fb..cd3017a 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 cb1ac48..e580416 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;
OpenPOWER on IntegriCloud