Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / include / net / gre.h

diff --git a/include/net/gre.h b/include/net/gre.h
index 73ea256eb7d79f15429caf12760444e6e8753f10..d25d836c129bf196b4b22a3bbb738192c2812ace 100644 (file)
--- a/include/net/gre.h
+++ b/include/net/gre.h
@@ -7,7 +7,15 @@
 struct gre_base_hdr {
        __be16 flags;
        __be16 protocol;
-};
+} __packed;
+
+struct gre_full_hdr {
+       struct gre_base_hdr fixed_header;
+       __be16 csum;
+       __be16 reserved1;
+       __be32 key;
+       __be32 seq;
+} __packed;
 #define GRE_HEADER_SECTION 4
 
 #define GREPROTO_CISCO         0