List of things fixed: - Two of the socket options were idented with spaces instead of tabs. - Trailing whitespace in some lines. - Improper spacing around parenthesis caught by checkpatch.pl. - Mix of space and tabs in tcp_word_hdr union.
Unified · Split
| @@ -51,7 +51,7 @@ struct tcphdr { · 50 unmodified lines | |||
| 51 | fin:1; | 51 | fin:1; |
| 52 | #else | 52 | #else |
| 53 | #error "Adjust your <asm/byteorder.h> defines" | 53 | #error "Adjust your <asm/byteorder.h> defines" |
| 54 | #endif | 54 | #endif |
| 55 | __be16 window; | 55 | __be16 window; |
| 56 | __sum16 check; | 56 | __sum16 check; |
| 57 | __be16 urg_ptr; | 57 | __be16 urg_ptr; |
| @@ -62,14 +62,14 @@ struct tcphdr { · 4 unmodified lines | |||
| 62 | * (union is compatible to any of its members) | 62 | * (union is compatible to any of its members) |
| 63 | * This means this part of the code is -fstrict-aliasing safe now. | 63 | * This means this part of the code is -fstrict-aliasing safe now. |
| 64 | */ | 64 | */ |
| 65 | union tcp_word_hdr { | 65 | union tcp_word_hdr { |
| 66 | struct tcphdr hdr; | 66 | struct tcphdr hdr; |
| 67 | __be32 words[5]; | 67 | __be32 words[5]; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) | 70 | #define tcp_flag_word(tp) (((union tcp_word_hdr *)(tp))->words[3]) |
| 71 | 71 | ||
| 72 | enum { | 72 | enum { |
| 73 | TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000), | 73 | TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000), |
| 74 | TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000), | 74 | TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000), |
| 75 | TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000), | 75 | TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000), |
| @@ -80,7 +80,7 @@ enum { · 4 unmodified lines | |||
| 80 | TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000), | 80 | TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000), |
| 81 | TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000), | 81 | TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000), |
| 82 | TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000) | 82 | TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000) |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | /* | 85 | /* |
| 86 | * TCP general constants | 86 | * TCP general constants |
| @@ -103,8 +103,8 @@ enum { · 16 unmodified lines | |||
| 103 | #define TCP_QUICKACK 12 /* Block/reenable quick acks */ | 103 | #define TCP_QUICKACK 12 /* Block/reenable quick acks */ |
| 104 | #define TCP_CONGESTION 13 /* Congestion control algorithm */ | 104 | #define TCP_CONGESTION 13 /* Congestion control algorithm */ |
| 105 | #define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ | 105 | #define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ |
| 106 | #define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/ | 106 | #define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/ |
| 107 | #define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */ | 107 | #define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */ |
| 108 | #define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */ | 108 | #define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */ |
| 109 | #define TCP_REPAIR 19 /* TCP sock is under repair right now */ | 109 | #define TCP_REPAIR 19 /* TCP sock is under repair right now */ |
| 110 | #define TCP_REPAIR_QUEUE 20 | 110 | #define TCP_REPAIR_QUEUE 20 |