Patchwork [net-next] tcp:elapsed variable calculated twice while keepalive working

login
register
mail settings
Submitter Tingwei Liu
Date Aug. 6, 2013, 12:05 p.m.
Message ID <1375790724-18834-1-git-send-email-tingw.liu@gmail.com>
Download mbox | patch
Permalink /patch/265044/
State Superseded
Delegated to: David Miller
Headers show

Comments

Tingwei Liu - Aug. 6, 2013, 12:05 p.m.
---
 net/ipv4/tcp_timer.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Eric Dumazet - Aug. 6, 2013, 12:23 p.m.
On Tue, 2013-08-06 at 20:05 +0800, Tingwei Liu wrote:
> ---
>  net/ipv4/tcp_timer.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

I suggest reading Documentation/SubmittingPatches, because you forgot
the "Signed-off-by:" tag, and you did the same on your last patch
submission.




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tingwei Liu - Aug. 6, 2013, 12:29 p.m.
On Tue, Aug 6, 2013 at 8:23 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> On Tue, 2013-08-06 at 20:05 +0800, Tingwei Liu wrote:
>> ---
>>  net/ipv4/tcp_timer.c |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> I suggest reading Documentation/SubmittingPatches, because you forgot
> the "Signed-off-by:" tag, and you did the same on your last patch
> submission.
Thanks very much! I will resend the patch in a few minutes.
>
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 4b85e6f..03091d9 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -591,11 +591,11 @@  static void tcp_keepalive_timer (unsigned long data)
 	if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE)
 		goto out;
 
-	elapsed = keepalive_time_when(tp);
-
 	/* It is alive without keepalive 8) */
-	if (tp->packets_out || tcp_send_head(sk))
+	if (tp->packets_out || tcp_send_head(sk)) {
+		elapsed = keepalive_time_when(tp);
 		goto resched;
+	}
 
 	elapsed = keepalive_time_elapsed(tp);