Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d5f4b2 authored Jul 03, 2011 by Gerrit Renker

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>

parent 1fd9d208

net/dccp/ccids/ccid2.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -583,15 +583,6 @@ static void ccid2_hc_tx_packet_recv(struct sock sk, struct sk_buff skb)
		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);

net/dccp/ccids/ccid2.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -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;
		};