Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755197AbYCCNWq (ORCPT ); Mon, 3 Mar 2008 08:22:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751951AbYCCNWi (ORCPT ); Mon, 3 Mar 2008 08:22:38 -0500 Received: from mta-1.ms.rz.RWTH-Aachen.DE ([134.130.7.72]:56204 "EHLO mta-1.ms.rz.rwth-aachen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbYCCNWi (ORCPT ); Mon, 3 Mar 2008 08:22:38 -0500 Date: Mon, 03 Mar 2008 14:23:38 +0100 From: Arnd Hannemann Subject: [PATCH] Removing unneeded statement from tcp_ipv4.c To: netdev@vger.kernel.org Cc: Linux Kernel Mailing List Message-id: <47CBFBDA.7000801@nets.rwth-aachen.de> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-15 Content-transfer-encoding: 7BIT X-IronPort-AV: E=Sophos;i="4.25,438,1199660400"; d="scan'208";a="53597868" User-Agent: Thunderbird 2.0.0.12 (X11/20080227) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1252 Lines: 31 Avoid setting tstamp_ok because this is done two lines later anyway. Signed-off-by: Arnd Hannemann diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 00156bf..a28c4c2 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) { + 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. */ 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/