From b5fa655a9c4a44901296f7371923d2a7d472119e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 21:24:24 -0700 Subject: [PATCH] --- yaml --- r: 36763 b: refs/heads/master c: 046d033148e6936ee2466d38214cf0743a210f39 h: refs/heads/master i: 36761: 1a30b46978081e1e4cf88d28f435081060135662 36759: 4eb59df1bf99ddaffc510538f053c22d2a1bb939 v: v3 --- [refs] | 2 +- trunk/include/linux/ip.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b7118e5140eb..6a4a79486279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4229934bd11e1dd03d433072ef3871915fc5e4f +refs/heads/master: 046d033148e6936ee2466d38214cf0743a210f39 diff --git a/trunk/include/linux/ip.h b/trunk/include/linux/ip.h index 2f4600146f83..6b25d36fc54c 100644 --- a/trunk/include/linux/ip.h +++ b/trunk/include/linux/ip.h @@ -96,7 +96,7 @@ struct iphdr { __be16 frag_off; __u8 ttl; __u8 protocol; - __u16 check; + __be16 check; __be32 saddr; __be32 daddr; /*The options start here. */ @@ -105,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 */