From patchwork Sat Feb 28 14:44:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 23889 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 3CE7FDDE19 for ; Sun, 1 Mar 2009 01:45:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753380AbZB1OpN (ORCPT ); Sat, 28 Feb 2009 09:45:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753091AbZB1OpG (ORCPT ); Sat, 28 Feb 2009 09:45:06 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:56777 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752773AbZB1Oow (ORCPT ); Sat, 28 Feb 2009 09:44:52 -0500 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sat, 28 Feb 2009 16:44:43 +0200 id 0008C1EA.49A94DDB.000038CB Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 514DAA00A8; Sat, 28 Feb 2009 16:44:43 +0200 (EET) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" To: David Miller Cc: netdev@vger.kernel.org, "=?utf-8?q?Ilpo=20J=C3=A4rvinen?=" Subject: [PATCH net-next 11/17] htcp: merge icsk_ca_state compare Date: Sat, 28 Feb 2009 16:44:36 +0200 Message-Id: <1235832283214-git-send-email-ilpo.jarvinen@helsinki.fi> X-Mailer: git-send-email 1.5.2.2 In-Reply-To: <12358322834113-git-send-email-ilpo.jarvinen@helsinki.fi> References: <12358322821815-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322821434-git-send-email-ilpo.jarvinen@helsinki.fi> <1235832282317-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322823783-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322821182-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322832831-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831953-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831147-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322833102-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322832711-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322834113-git-send-email-ilpo.jarvinen@helsinki.fi> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ilpo Järvinen Similar to what is done elsewhere in TCP code when double state checks are being done. Signed-off-by: Ilpo Järvinen --- net/ipv4/tcp_htcp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index 937549b..9520eec 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c @@ -115,8 +115,7 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt return; /* achieved throughput calculations */ - if (icsk->icsk_ca_state != TCP_CA_Open && - icsk->icsk_ca_state != TCP_CA_Disorder) { + if (!((1 << icsk->icsk_ca_state) & (TCPF_CA_Open | TCPF_CA_Disorder))) { ca->packetcount = 0; ca->lasttime = now; return;