diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2011-07-03 09:04:18 -0600 |
|---|---|---|
| committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2011-07-04 12:37:30 -0600 |
| commit | b4d5f4b2884625d13c7ef5b9fd085ec93bbf545c (patch) | |
| tree | 6034da8babcad421dc2dc44d124a5730d3d8d329 /net | |
| parent | 1fd9d2081a9d8d77e5afccd5aafd28310cab3bfc (diff) | |
| download | linux-stable-b4d5f4b2884625d13c7ef5b9fd085ec93bbf545c.tar.gz linux-stable-b4d5f4b2884625d13c7ef5b9fd085ec93bbf545c.tar.bz2 linux-stable-b4d5f4b2884625d13c7ef5b9fd085ec93bbf545c.zip | |
dccp ccid-2: move rfc 3390 function into header file
This moves CCID-2's initial window function into the header file, since several
parts throughout the CCID-2 code need to call it (CCID-2 still uses RFC 3390).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Leandro Melo de Sales <leandro@ic.ufal.br>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 9 | ||||
| -rw-r--r-- | net/dccp/ccids/ccid2.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index fadecd20d75b..e96d5e810039 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -583,15 +583,6 @@ done: dccp_ackvec_parsed_cleanup(&hc->tx_av_chunks); } -/* - * Convert RFC 3390 larger initial window into an equivalent number of packets. - * This is based on the numbers specified in RFC 5681, 3.1. - */ -static inline u32 rfc3390_bytes_to_packets(const u32 smss) -{ - return smss <= 1095 ? 4 : (smss > 2190 ? 2 : 3); -} - static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) { struct ccid2_hc_tx_sock *hc = ccid_priv(ccid); diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h index e9985dafc2c7..f17460a8fe7f 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h @@ -88,6 +88,15 @@ static inline bool ccid2_cwnd_network_limited(struct ccid2_hc_tx_sock *hc) return hc->tx_pipe >= hc->tx_cwnd; } +/* + * Convert RFC 3390 larger initial window into an equivalent number of packets. + * This is based on the numbers specified in RFC 5681, 3.1. + */ +static inline u32 rfc3390_bytes_to_packets(const u32 smss) +{ + return smss <= 1095 ? 4 : (smss > 2190 ? 2 : 3); +} + struct ccid2_hc_rx_sock { int rx_data; }; |