Backport of eddc9ec53be2ecdbf4efe0efd4a83052594f0ac0 providing a

functional alternative without removing the iph field.

commit eddc9ec53be2ecdbf4efe0efd4a83052594f0ac0
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Fri Apr 20 22:47:35 2007 -0700

    [SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph

    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/ip.h b/include/linux/ip.h
index 4b55cf1df732e2f8752a8f517c6a06063ace18ff..6c1ccd396ad63888d77d9b661e667ecb26eddc9b 100644 (file)
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -101,6 +101,15 @@ struct iphdr {
        /*The options start here. */
 };
 
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct iphdr *ip_hdr(const struct sk_buff *skb)
+{
+       return skb->nh.iph;
+}
+#endif
+
 struct ip_auth_hdr {
        __u8  nexthdr;
        __u8  hdrlen;           /* This one is measured in 32 bit units! */