diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-09-04 01:30:19 -0400 |
---|---|---|
committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-09-04 01:45:39 -0400 |
commit | 6224877b2ca4be5de96270a8ae490fe2ba11b0e0 (patch) | |
tree | 95eef39293311959842e5476eace895e457eb780 /include/net/tcp.h | |
parent | b25b0c60b0c39a82bc651aeb6443bcb36cd17f76 (diff) |
tcp/dccp: Consolidate common code for RFC 3390 conversion
This patch consolidates the code common to TCP and CCID-2:
* TCP uses RFC 3390 in a packet-oriented manner (tcp_input.c) and
* CCID-2 uses RFC 3390 in packet-oriented manner (RFC 4341).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 8983386356a..6bc4b8148ca 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -782,6 +782,21 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk) | |||
782 | /* Use define here intentionally to get WARN_ON location shown at the caller */ | 782 | /* Use define here intentionally to get WARN_ON location shown at the caller */ |
783 | #define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out) | 783 | #define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out) |
784 | 784 | ||
785 | /* | ||
786 | * Convert RFC3390 larger initial windows into an equivalent number of packets. | ||
787 | * | ||
788 | * John Heffner states: | ||
789 | * | ||
790 | * The RFC specifies a window of no more than 4380 bytes | ||
791 | * unless 2*MSS > 4380. Reading the pseudocode in the RFC | ||
792 | * is a bit misleading because they use a clamp at 4380 bytes | ||
793 | * rather than a multiplier in the relevant range. | ||
794 | */ | ||
795 | static inline u32 rfc3390_bytes_to_packets(const u32 bytes) | ||
796 | { | ||
797 | return bytes <= 1095 ? 4 : (bytes > 1460 ? 2 : 3); | ||
798 | } | ||
799 | |||
785 | extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh); | 800 | extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh); |
786 | extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst); | 801 | extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst); |
787 | 802 | ||