From patchwork Sun Apr 1 15:04:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 149929 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 8A309B6FEB for ; Mon, 2 Apr 2012 01:07:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431Ab2DAPHU (ORCPT ); Sun, 1 Apr 2012 11:07:20 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:65298 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752222Ab2DAPHS (ORCPT ); Sun, 1 Apr 2012 11:07:18 -0400 Received: by iagz16 with SMTP id z16so3029432iag.19 for ; Sun, 01 Apr 2012 08:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=kuq7W4TyunjhO9LYsp9JoREHibq0GXwQuZIBZQcXSA4=; b=ZZKvQP9zINUXx3ku9vHCGoEbdpoA6d78ux4iowm9CAJ+rmjSudvmosfI+TpTTnHWbi wfXYFuOHG99h/fCFtaA9TMzT0D8SgmreE9otMh6Tc1wOpAjTrFJCRc+TEoNdTfYeee66 pd2iSwv1mgqxYRkB7CkFEtWuWMu+wLKw28dlWRhUJXHCIhfZ6HERj+AftLLrnqO+JPEP 8aNNZUp4crmVzzS6i02KxcRIBEqqtI/w9C3EJAFdpOqmANK6KWUvQlaRwoUMO8nw+ftW h4zbzbHcVeEIDYbxmb+B4FpCrTtTeNy/no/y/jIs73HTUerFDOQT0I1anI19vDSzcMwo s2TQ== Received: by 10.50.42.134 with SMTP id o6mr3219532igl.72.1333292838164; Sun, 01 Apr 2012 08:07:18 -0700 (PDT) Received: from localhost.localdomain ([221.238.113.246]) by mx.google.com with ESMTPS id md6sm9090573igc.0.2012.04.01.08.07.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Apr 2012 08:07:17 -0700 (PDT) From: Changli Gao To: Pablo Neira Ayuso Cc: Patrick McHardy , "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao Subject: [PATCH] netfilter: don't do window scaling for a picked up connection Date: Sun, 1 Apr 2012 23:04:43 +0800 Message-Id: <1333292683-31414-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For a picked up connection, the window scaling option is also lost, because this option is only valid in SYN or SYN/ACK segments. We should remove the useless expression to save the CPU power. Signed-off-by: Changli Gao --- net/netfilter/nf_conntrack_proto_tcp.c | 1 - 1 file changed, 1 deletion(-) -- 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 diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 361eade..22f0500 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -584,7 +584,6 @@ static bool tcp_in_window(const struct nf_conn *ct, * Let's try to use the data from the packet. */ sender->td_end = end; - win <<= sender->td_scale; sender->td_maxwin = (win == 0 ? 1 : win); sender->td_maxend = end + sender->td_maxwin; /*