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.107' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
ipv4
/
tcp_timer.c
diff --git
a/net/ipv4/tcp_timer.c
b/net/ipv4/tcp_timer.c
index 98cd820c1207825a516b30e24cb796daad3c9c4b..8cb86fa84e2d448d61086a0fe4f7a9b7ccfe98c6 100644
(file)
--- a/
net/ipv4/tcp_timer.c
+++ b/
net/ipv4/tcp_timer.c
@@
-205,7
+205,8
@@
void tcp_delack_timer_handler(struct sock *sk)
sk_mem_reclaim_partial(sk);
sk_mem_reclaim_partial(sk);
- if (sk->sk_state == TCP_CLOSE || !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
+ if (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) ||
+ !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
goto out;
if (time_after(icsk->icsk_ack.timeout, jiffies)) {
goto out;
if (time_after(icsk->icsk_ack.timeout, jiffies)) {
@@
-490,7
+491,8
@@
void tcp_write_timer_handler(struct sock *sk)
struct inet_connection_sock *icsk = inet_csk(sk);
int event;
struct inet_connection_sock *icsk = inet_csk(sk);
int event;
- if (sk->sk_state == TCP_CLOSE || !icsk->icsk_pending)
+ if (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) ||
+ !icsk->icsk_pending)
goto out;
if (icsk->icsk_MMSRB != 1)
{
goto out;
if (icsk->icsk_MMSRB != 1)
{