Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36763
b: refs/heads/master
c: 046d033
h: refs/heads/master
i:
  36761: 1a30b46
  36759: 4eb59df
v: v3
  • Loading branch information
Al Viro authored and David S. Miller committed Sep 29, 2006
1 parent da0ad3b commit b5fa655
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4229934bd11e1dd03d433072ef3871915fc5e4f
refs/heads/master: 046d033148e6936ee2466d38214cf0743a210f39
14 changes: 7 additions & 7 deletions trunk/include/linux/ip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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 */

0 comments on commit b5fa655

Please sign in to comment.