diff options
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 8ebf497907f8..0e058a2d1c6d 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 22 | 22 | ||
| 23 | struct tcphdr { | 23 | struct tcphdr { |
| 24 | __u16 source; | 24 | __be16 source; |
| 25 | __u16 dest; | 25 | __be16 dest; |
| 26 | __u32 seq; | 26 | __be32 seq; |
| 27 | __u32 ack_seq; | 27 | __be32 ack_seq; |
| 28 | #if defined(__LITTLE_ENDIAN_BITFIELD) | 28 | #if defined(__LITTLE_ENDIAN_BITFIELD) |
| 29 | __u16 res1:4, | 29 | __u16 res1:4, |
| 30 | doff:4, | 30 | doff:4, |
| @@ -50,9 +50,9 @@ struct tcphdr { | |||
| 50 | #else | 50 | #else |
| 51 | #error "Adjust your <asm/byteorder.h> defines" | 51 | #error "Adjust your <asm/byteorder.h> defines" |
| 52 | #endif | 52 | #endif |
| 53 | __u16 window; | 53 | __be16 window; |
| 54 | __u16 check; | 54 | __be16 check; |
| 55 | __u16 urg_ptr; | 55 | __be16 urg_ptr; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | /* | 58 | /* |
| @@ -62,7 +62,7 @@ struct tcphdr { | |||
| 62 | */ | 62 | */ |
| 63 | union tcp_word_hdr { | 63 | union tcp_word_hdr { |
| 64 | struct tcphdr hdr; | 64 | struct tcphdr hdr; |
| 65 | __u32 words[5]; | 65 | __be32 words[5]; |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) | 68 | #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) |
| @@ -166,6 +166,11 @@ struct tcp_info | |||
| 166 | #include <net/inet_timewait_sock.h> | 166 | #include <net/inet_timewait_sock.h> |
| 167 | 167 | ||
| 168 | /* This defines a selective acknowledgement block. */ | 168 | /* This defines a selective acknowledgement block. */ |
| 169 | struct tcp_sack_block_wire { | ||
| 170 | __be32 start_seq; | ||
| 171 | __be32 end_seq; | ||
| 172 | }; | ||
| 173 | |||
| 169 | struct tcp_sack_block { | 174 | struct tcp_sack_block { |
| 170 | __u32 start_seq; | 175 | __u32 start_seq; |
| 171 | __u32 end_seq; | 176 | __u32 end_seq; |
| @@ -211,7 +216,7 @@ struct tcp_sock { | |||
| 211 | * Header prediction flags | 216 | * Header prediction flags |
| 212 | * 0x5?10 << 16 + snd_wnd in net byte order | 217 | * 0x5?10 << 16 + snd_wnd in net byte order |
| 213 | */ | 218 | */ |
| 214 | __u32 pred_flags; | 219 | __be32 pred_flags; |
| 215 | 220 | ||
| 216 | /* | 221 | /* |
| 217 | * RFC793 variables by their proper names. This means you can | 222 | * RFC793 variables by their proper names. This means you can |
