diff options
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index c99774f15eba..5c472f255b77 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -244,12 +244,7 @@ static inline int before(__u32 seq1, __u32 seq2) | |||
244 | { | 244 | { |
245 | return (__s32)(seq1-seq2) < 0; | 245 | return (__s32)(seq1-seq2) < 0; |
246 | } | 246 | } |
247 | 247 | #define after(seq2, seq1) before(seq1, seq2) | |
248 | static inline int after(__u32 seq1, __u32 seq2) | ||
249 | { | ||
250 | return (__s32)(seq2-seq1) < 0; | ||
251 | } | ||
252 | |||
253 | 248 | ||
254 | /* is s2<=s1<=s3 ? */ | 249 | /* is s2<=s1<=s3 ? */ |
255 | static inline int between(__u32 seq1, __u32 seq2, __u32 seq3) | 250 | static inline int between(__u32 seq1, __u32 seq2, __u32 seq3) |
@@ -807,9 +802,8 @@ static inline void tcp_update_wl(struct tcp_sock *tp, u32 ack, u32 seq) | |||
807 | /* | 802 | /* |
808 | * Calculate(/check) TCP checksum | 803 | * Calculate(/check) TCP checksum |
809 | */ | 804 | */ |
810 | static inline __sum16 tcp_v4_check(struct tcphdr *th, int len, | 805 | static inline __sum16 tcp_v4_check(int len, __be32 saddr, |
811 | __be32 saddr, __be32 daddr, | 806 | __be32 daddr, __wsum base) |
812 | __wsum base) | ||
813 | { | 807 | { |
814 | return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base); | 808 | return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base); |
815 | } | 809 | } |