[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <47CFCB8C.5070801@nets.rwth-aachen.de>
Date: Thu, 06 Mar 2008 11:46:36 +0100
From: Arnd Hannemann <hannemann@...s.rwth-aachen.de>
To: David Miller <davem@...emloft.net>
Cc: ilpo.jarvinen@...sinki.fi, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH-RESEND] Removing unneeded statement from tcp_ipv4.c
David Miller schrieb:
> From: Arnd Hannemann <hannemann@...s.rwth-aachen.de>
> Date: Tue, 04 Mar 2008 00:18:07 +0100
>
>> Avoid setting tstamp_ok because this is done two lines later anyway.
>>
>> Signed-off-by: Arnd Hannemann <hannemann@...s.rwth-aachen.de>
>
> Patch does not apply, your email client has corrupted the
> patch by turning tabs into spaces etc.
>
Sorry, this one should apply.
Avoid setting tstamp_ok because this is done two lines later anyway.
Signed-off-by: Arnd Hannemann <hannemann@...s.rwth-aachen.de>
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 00156bf..ecef356 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
tmp_opt.saw_tstamp = 0;
}
- if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
- /* Some OSes (unknown ones, but I see them on web server, which
- * contains information interesting only for windows'
- * users) do not send their stamp in SYN. It is easy case.
- * We simply do not advertise TS support.
- */
+ /* Some OSes (unknown ones, but I see them on web server, which
+ * contains information interesting only for windows'
+ * users) do not send their stamp in SYN. It is easy case.
+ * We simply do not advertise TS support.
+ */
+ if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
tmp_opt.saw_tstamp = 0;
- tmp_opt.tstamp_ok = 0;
- }
+
tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
tcp_openreq_init(req, &tmp_opt, skb);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists