Commit 688d1945 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

tcp: whitespace fixes 



Fix places where there is space before tab, long lines, and
awkward if(){, double spacing etc. Add blank line after declaration/initialization.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d09d3038

net/ipv4/tcp_bic.c

+4 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/module.h>

#include <net/tcp.h>





#define BICTCP_BETA_SCALE    1024	/* Scale factor beta calculation

					 * max_cwnd = snd_cwnd * beta

					 */
@@ -46,7 +45,6 @@ MODULE_PARM_DESC(initial_ssthresh, "initial value of slow start threshold"); 
module_param(smooth_part, int, 0644);

MODULE_PARM_DESC(smooth_part, "log(B/(B*Smin))/log(B/(B-1))+B, # of RTT from Wmax-B to Wmax");





/* BIC TCP Parameters */

struct bictcp {

	u32	cnt;		/* increase cwnd by 1 after ACKs */
@@ -154,7 +152,6 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked) 
		bictcp_update(ca, tp->snd_cwnd);

		tcp_cong_avoid_ai(tp, ca->cnt);

	}



}



/*
@@ -177,7 +174,6 @@ static u32 bictcp_recalc_ssthresh(struct sock *sk) 


	ca->loss_cwnd = tp->snd_cwnd;





	if (tp->snd_cwnd <= low_window)

		return max(tp->snd_cwnd >> 1U, 2U);

	else
@@ -188,6 +184,7 @@ static u32 bictcp_undo_cwnd(struct sock *sk) 
{

	const struct tcp_sock *tp = tcp_sk(sk);

	const struct bictcp *ca = inet_csk_ca(sk);



	return max(tp->snd_cwnd, ca->loss_cwnd);

}
@@ -206,12 +203,12 @@ static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt) 


	if (icsk->icsk_ca_state == TCP_CA_Open) {

		struct bictcp *ca = inet_csk_ca(sk);



		cnt -= ca->delayed_ack >> ACK_RATIO_SHIFT;

		ca->delayed_ack += cnt;

	}

}





static struct tcp_congestion_ops bictcp __read_mostly = {

	.init		= bictcp_init,

	.ssthresh	= bictcp_recalc_ssthresh,

net/ipv4/tcp_cong.c

+1 −4
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static int __init tcp_congestion_default(void) 
}

late_initcall(tcp_congestion_default);





/* Build string with list of available congestion control values */

void tcp_get_available_congestion_control(char *buf, size_t maxlen)

{
@@ -154,7 +153,6 @@ void tcp_get_available_congestion_control(char *buf, size_t maxlen) 
		offs += snprintf(buf + offs, maxlen - offs,

				 "%s%s",

				 offs == 0 ? "" : " ", ca->name);



	}

	rcu_read_unlock();

}
@@ -186,7 +184,6 @@ void tcp_get_allowed_congestion_control(char *buf, size_t maxlen) 
		offs += snprintf(buf + offs, maxlen - offs,

				 "%s%s",

				 offs == 0 ? "" : " ", ca->name);



	}

	rcu_read_unlock();

}
@@ -230,7 +227,6 @@ int tcp_set_allowed_congestion_control(char *val) 
	return ret;

}





/* Change congestion control for socket */

int tcp_set_congestion_control(struct sock *sk, const char *name)

{
@@ -337,6 +333,7 @@ EXPORT_SYMBOL_GPL(tcp_reno_cong_avoid); 
u32 tcp_reno_ssthresh(struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);



	return max(tp->snd_cwnd >> 1U, 2U);

}

EXPORT_SYMBOL_GPL(tcp_reno_ssthresh);

net/ipv4/tcp_cubic.c

+10 −8
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ struct bictcp { 
	u32	last_cwnd;	/* the last snd_cwnd */

	u32	last_time;	/* time when updated last_cwnd */

	u32	bic_origin_point;/* origin point of bic function */

	u32	bic_K;		/* time to origin point from the beginning of the current epoch */

	u32	bic_K;		/* time to origin point

				   from the beginning of the current epoch */

	u32	delay_min;	/* min delay (msec << 3) */

	u32	epoch_start;	/* beginning of an epoch */

	u32	ack_cnt;	/* number of acks */
@@ -219,7 +220,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
	ca->last_time = tcp_time_stamp;



	if (ca->epoch_start == 0) {

		ca->epoch_start = tcp_time_stamp;	/* record the beginning of an epoch */

		ca->epoch_start = tcp_time_stamp;	/* record beginning */

		ca->ack_cnt = 1;			/* start counting */

		ca->tcp_cwnd = cwnd;			/* syn with cubic */
@@ -285,6 +286,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
	/* TCP Friendly */

	if (tcp_friendliness) {

		u32 scale = beta_scale;



		delta = (cwnd * scale) >> 3;

		while (ca->ack_cnt > delta) {		/* update tcp cwnd */

			ca->ack_cnt -= delta;
@@ -320,7 +322,6 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked) 
		bictcp_update(ca, tp->snd_cwnd);

		tcp_cong_avoid_ai(tp, ca->cnt);

	}



}



static u32 bictcp_recalc_ssthresh(struct sock *sk)
@@ -452,7 +453,8 @@ static int __init cubictcp_register(void) 
	 * based on SRTT of 100ms

	 */



	beta_scale = 8*(BICTCP_BETA_SCALE+beta)/ 3 / (BICTCP_BETA_SCALE - beta);

	beta_scale = 8*(BICTCP_BETA_SCALE+beta) / 3

		/ (BICTCP_BETA_SCALE - beta);



	cube_rtt_scale = (bic_scale * 10);	/* 1024*c/rtt */

net/ipv4/tcp_diag.c

+2 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 *      2 of the License, or (at your option) any later version.

 */





#include <linux/module.h>

#include <linux/inet_diag.h>

net/ipv4/tcp_highspeed.c

+72 −73
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/module.h>

#include <net/tcp.h>





/* From AIMD tables from RFC 3649 appendix B,

 * with fixed-point MD scaled <<8.

 */