aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_htcp.c
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2014-08-30 02:32:05 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-01 21:12:45 -0400
commit688d1945bc89bd585ec67b5b83121f499e6290bb (patch)
tree3138045afe46d72e458c1cfb3dd2552b2acaf915 /net/ipv4/tcp_htcp.c
parentd09d3038a336cbab6bde616ce44266c36c214f81 (diff)
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: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
-rw-r--r--net/ipv4/tcp_htcp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 031361311a8b..58469fff6c18 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -98,7 +98,8 @@ static inline void measure_rtt(struct sock *sk, u32 srtt)
98 } 98 }
99} 99}
100 100
101static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt) 101static void measure_achieved_throughput(struct sock *sk,
102 u32 pkts_acked, s32 rtt)
102{ 103{
103 const struct inet_connection_sock *icsk = inet_csk(sk); 104 const struct inet_connection_sock *icsk = inet_csk(sk);
104 const struct tcp_sock *tp = tcp_sk(sk); 105 const struct tcp_sock *tp = tcp_sk(sk);
@@ -148,8 +149,8 @@ static inline void htcp_beta_update(struct htcp *ca, u32 minRTT, u32 maxRTT)
148 if (use_bandwidth_switch) { 149 if (use_bandwidth_switch) {
149 u32 maxB = ca->maxB; 150 u32 maxB = ca->maxB;
150 u32 old_maxB = ca->old_maxB; 151 u32 old_maxB = ca->old_maxB;
151 ca->old_maxB = ca->maxB;
152 152
153 ca->old_maxB = ca->maxB;
153 if (!between(5 * maxB, 4 * old_maxB, 6 * old_maxB)) { 154 if (!between(5 * maxB, 4 * old_maxB, 6 * old_maxB)) {
154 ca->beta = BETA_MIN; 155 ca->beta = BETA_MIN;
155 ca->modeswitch = 0; 156 ca->modeswitch = 0;
@@ -270,6 +271,7 @@ static void htcp_state(struct sock *sk, u8 new_state)
270 case TCP_CA_Open: 271 case TCP_CA_Open:
271 { 272 {
272 struct htcp *ca = inet_csk_ca(sk); 273 struct htcp *ca = inet_csk_ca(sk);
274
273 if (ca->undo_last_cong) { 275 if (ca->undo_last_cong) {
274 ca->last_cong = jiffies; 276 ca->last_cong = jiffies;
275 ca->undo_last_cong = 0; 277 ca->undo_last_cong = 0;