diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /net/ipv4/tcp_timer.c | |
parent | 55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff) | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
download | linux-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.xz |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index fc04711..d47c1b4 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -347,8 +347,8 @@ void tcp_retransmit_timer(struct sock *sk) return; } if (tp->fastopen_rsk) { - BUG_ON(sk->sk_state != TCP_SYN_RECV && - sk->sk_state != TCP_FIN_WAIT1); + WARN_ON_ONCE(sk->sk_state != TCP_SYN_RECV && + sk->sk_state != TCP_FIN_WAIT1); tcp_fastopen_synack_timer(sk); /* Before we receive ACK to our SYN-ACK don't retransmit * anything else (e.g., data or FIN segments). |