Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / include / linux / icmp.h

diff --git a/include/linux/icmp.h b/include/linux/icmp.h
index 878cfe4e587f29d0d5dd3129180227bed8bf8990..474f2a51cf0af66474be229b626403975a36683c 100644 (file)
--- a/include/linux/icmp.h
+++ b/include/linux/icmp.h
@@ -68,7 +68,7 @@
 struct icmphdr {
   __u8         type;
   __u8         code;
-  __be16       checksum;
+  __sum16      checksum;
   union {
        struct {
                __be16  id;
@@ -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_transport_header(skb);
+}
+#endif
+
 /*
  *     constants for (set|get)sockopt
  */