projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.58' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
ipv4
/
tcp_output.c
diff --git
a/net/ipv4/tcp_output.c
b/net/ipv4/tcp_output.c
index 62aff23d19d1c44078fbf5c660ba93c13270559f..eef147cff1265516bf16a6fea281e05a56098cf5 100644
(file)
--- a/
net/ipv4/tcp_output.c
+++ b/
net/ipv4/tcp_output.c
@@
-231,14
+231,13
@@
void tcp_select_initial_window(int __space, __u32 mss,
}
/* Set initial window to a value enough for senders starting with
}
/* Set initial window to a value enough for senders starting with
- * initial congestion window of
TCP_DEFAULT_INIT_RCVWND
. Place
+ * initial congestion window of
sysctl_tcp_default_init_rwnd
. Place
* a limit on the initial window when mss is larger than 1460.
*/
if (mss > (1 << *rcv_wscale)) {
* a limit on the initial window when mss is larger than 1460.
*/
if (mss > (1 << *rcv_wscale)) {
- int init_cwnd =
TCP_DEFAULT_INIT_RCVWND
;
+ int init_cwnd =
sysctl_tcp_default_init_rwnd
;
if (mss > 1460)
if (mss > 1460)
- init_cwnd =
- max_t(u32, (1460 * TCP_DEFAULT_INIT_RCVWND) / mss, 2);
+ init_cwnd = max_t(u32, (1460 * init_cwnd) / mss, 2);
/* when initializing use the value from init_rcv_wnd
* rather than the default from above
*/
/* when initializing use the value from init_rcv_wnd
* rather than the default from above
*/
@@
-1994,7
+1993,7
@@
bool tcp_schedule_loss_probe(struct sock *sk)
}
inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,
}
inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,
-
TCP_RTO_MAX
);
+
sysctl_tcp_rto_max
);
return true;
}
return true;
}
@@
-2036,9
+2035,7
@@
void tcp_send_loss_probe(struct sock *sk)
if (WARN_ON(!skb || !tcp_skb_pcount(skb)))
goto rearm_timer;
if (WARN_ON(!skb || !tcp_skb_pcount(skb)))
goto rearm_timer;
- /* Probe with zero data doesn't trigger fast recovery. */
- if (skb->len > 0)
- err = __tcp_retransmit_skb(sk, skb);
+ err = __tcp_retransmit_skb(sk, skb);
/* Record snd_nxt for loss detection. */
if (likely(!err))
/* Record snd_nxt for loss detection. */
if (likely(!err))
@@
-2047,7
+2044,7
@@
void tcp_send_loss_probe(struct sock *sk)
rearm_timer:
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
rearm_timer:
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
-
TCP_RTO_MAX
);
+
sysctl_tcp_rto_max
);
if (likely(!err))
NET_INC_STATS_BH(sock_net(sk),
if (likely(!err))
NET_INC_STATS_BH(sock_net(sk),
@@
-2569,7
+2566,7
@@
begin_fwd:
if (skb == tcp_write_queue_head(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
if (skb == tcp_write_queue_head(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
-
TCP_RTO_MAX
);
+
sysctl_tcp_rto_max
);
}
}
}
}
@@
-3001,7
+2998,7
@@
int tcp_connect(struct sock *sk)
/* Timer for repeating the SYN until an answer. */
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
/* Timer for repeating the SYN until an answer. */
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
- inet_csk(sk)->icsk_rto,
TCP_RTO_MAX
);
+ inet_csk(sk)->icsk_rto,
sysctl_tcp_rto_max
);
return 0;
}
EXPORT_SYMBOL(tcp_connect);
return 0;
}
EXPORT_SYMBOL(tcp_connect);
@@
-3080,7
+3077,7
@@
void tcp_send_ack(struct sock *sk)
inet_csk_schedule_ack(sk);
inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
inet_csk_schedule_ack(sk);
inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
- TCP_DELACK_MAX,
TCP_RTO_MAX
);
+ TCP_DELACK_MAX,
sysctl_tcp_rto_max
);
return;
}
return;
}
@@
-3200,8
+3197,8
@@
void tcp_send_probe0(struct sock *sk)
icsk->icsk_backoff++;
icsk->icsk_probes_out++;
inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,
icsk->icsk_backoff++;
icsk->icsk_probes_out++;
inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,
- min
(icsk->icsk_rto << icsk->icsk_backoff, TCP_RTO_MAX
),
-
TCP_RTO_MAX
);
+ min
_t(unsigned int, icsk->icsk_rto << icsk->icsk_backoff, sysctl_tcp_rto_max
),
+
sysctl_tcp_rto_max
);
} else {
/* If packet was not sent due to local congestion,
* do not backoff and do not remember icsk_probes_out.
} else {
/* If packet was not sent due to local congestion,
* do not backoff and do not remember icsk_probes_out.
@@
-3214,6
+3211,6
@@
void tcp_send_probe0(struct sock *sk)
inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,
min(icsk->icsk_rto << icsk->icsk_backoff,
TCP_RESOURCE_PROBE_INTERVAL),
inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,
min(icsk->icsk_rto << icsk->icsk_backoff,
TCP_RESOURCE_PROBE_INTERVAL),
-
TCP_RTO_MAX
);
+
sysctl_tcp_rto_max
);
}
}
}
}