Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / linux / if_pppox.h

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 7044f8ab30a085858f778154e41a81af56ebd1bd..6f987be60fe26ed7cf36287f42a60f5a2fc3f557 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -111,12 +111,15 @@ struct pppoe_hdr {
        struct pppoe_tag tag[0];
 } __attribute__ ((packed));
 
+/* Length of entire PPPoE + PPP header */
+#define PPPOE_SES_HLEN 8
+
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
 
 static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
 {
-       return (struct pppoe_hdr *)skb->nh.raw;
+       return (struct pppoe_hdr *)skb_network_header(skb);
 }
 
 struct pppoe_opt {