1 files changed, 8 insertions, 7 deletions

diff --git a/include/linux/ip.h b/include/linux/ip.h
index 4b55cf1df73..6b25d36fc54 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -57,6 +57,7 @@
 #define IPOPT_SEC       (2 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_LSRR      (3 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
+#define IPOPT_CIPSO     (6 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_RR        (7 |IPOPT_CONTROL)
 #define IPOPT_SID       (8 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_SSRR      (9 |IPOPT_CONTROL|IPOPT_COPY)
@@ -95,7 +96,7 @@ struct iphdr {
         __be16  frag_off;
         __u8    ttl;
         __u8    protocol;
-        __u16   check;
+        __be16  check;
         __be32  saddr;
         __be32  daddr;
         /*The options start here. */
@@ -104,22 +105,22 @@ struct iphdr {
 struct ip_auth_hdr {
         __u8  nexthdr;
         __u8  hdrlen;           /* This one is measured in 32 bit units! */
-        __u16 reserved;
-        __u32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be16 reserved;
+        __be32 spi;
+        __be32 seq_no;          /* Sequence number */
         __u8  auth_data[0];     /* Variable len but >=4. Mind the 64 bit alignment! */
 };
 
 struct ip_esp_hdr {
-        __u32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be32 spi;
+        __be32 seq_no;          /* Sequence number */
         __u8  enc_data[0];      /* Variable len but >=8. Mind the 64 bit alignment! */
 };
 
 struct ip_comp_hdr {
         __u8 nexthdr;
         __u8 flags;
-        __u16 cpi;
+        __be16 cpi;
 };
 
 #endif  /* _LINUX_IP_H */