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

Commit c3a05c60 authored Dec 02, 2007 by Ilpo Järvinen Committed by David S. Miller Jan 28, 2008

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid



Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ede9f3b1

include/net/tcp.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -652,7 +652,7 @@ struct tcp_congestion_ops {
	/* lower bound for congestion window (optional) */		/* lower bound for congestion window (optional) */
	u32 (min_cwnd)(const struct sock sk);		u32 (min_cwnd)(const struct sock sk);
	/* do new cwnd calculation (required) */		/* do new cwnd calculation (required) */
	void (cong_avoid)(struct sock sk, u32 ack, u32 in_flight, int good_ack);		void (cong_avoid)(struct sock sk, u32 ack, u32 in_flight);
	/* call before changing ca_state (optional) */		/* call before changing ca_state (optional) */
	void (set_state)(struct sock sk, u8 new_state);		void (set_state)(struct sock sk, u8 new_state);
	/* call when cwnd event occurs (optional) */		/* call when cwnd event occurs (optional) */
	@@ -683,7 +683,7 @@ extern void tcp_slow_start(struct tcp_sock *tp);

	extern struct tcp_congestion_ops tcp_init_congestion_ops;		extern struct tcp_congestion_ops tcp_init_congestion_ops;
	extern u32 tcp_reno_ssthresh(struct sock *sk);		extern u32 tcp_reno_ssthresh(struct sock *sk);
	extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag);		extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight);
	extern u32 tcp_reno_min_cwnd(const struct sock *sk);		extern u32 tcp_reno_min_cwnd(const struct sock *sk);
	extern struct tcp_congestion_ops tcp_reno;		extern struct tcp_congestion_ops tcp_reno;

net/ipv4/tcp_bic.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -136,8 +136,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
	ca->cnt = 1;		ca->cnt = 1;
	}		}

	static void bictcp_cong_avoid(struct sock *sk, u32 ack,		static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
	u32 in_flight, int data_acked)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);
	struct bictcp *ca = inet_csk_ca(sk);		struct bictcp *ca = inet_csk_ca(sk);

net/ipv4/tcp_cong.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -324,7 +324,7 @@ EXPORT_SYMBOL_GPL(tcp_slow_start);
	/* This is Jacobson's slow start and congestion avoidance.		/* This is Jacobson's slow start and congestion avoidance.
	* SIGCOMM '88, p. 328.		* SIGCOMM '88, p. 328.
	*/		*/
	void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag)		void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);

net/ipv4/tcp_cubic.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -246,8 +246,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
	ca->cnt = 1;		ca->cnt = 1;
	}		}

	static void bictcp_cong_avoid(struct sock *sk, u32 ack,		static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
	u32 in_flight, int data_acked)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);
	struct bictcp *ca = inet_csk_ca(sk);		struct bictcp *ca = inet_csk_ca(sk);

net/ipv4/tcp_highspeed.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -109,8 +109,7 @@ static void hstcp_init(struct sock *sk)
	tp->snd_cwnd_clamp = min_t(u32, tp->snd_cwnd_clamp, 0xffffffff/128);		tp->snd_cwnd_clamp = min_t(u32, tp->snd_cwnd_clamp, 0xffffffff/128);
	}		}

	static void hstcp_cong_avoid(struct sock *sk, u32 adk,		static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 in_flight)
	u32 in_flight, int data_acked)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);
	struct hstcp *ca = inet_csk_ca(sk);		struct hstcp *ca = inet_csk_ca(sk);