From patchwork Sat Nov 20 07:55:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 72345 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 9D2AC1007D2 for ; Sat, 20 Nov 2010 18:56:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067Ab0KTHz7 (ORCPT ); Sat, 20 Nov 2010 02:55:59 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:33923 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918Ab0KTHzz (ORCPT ); Sat, 20 Nov 2010 02:55:55 -0500 Received: by pvh1 with SMTP id 1so844737pvh.19 for ; Fri, 19 Nov 2010 23:55:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=mmaBjvCf2BnXbzY0+CjttmwiY1z0lxurtdT6UPIc8TY=; b=oeUFDo/fZ1V38WHoPG0HQkbe4Yp1LMqnDWblxWWGfktXzGM7f8h6kTGM159EhGsZIl YrA1CHh9wsf6gSAEoqG6rcuXrxRUq/M5FzZiZQjKwKROqWr5S8QTjYV69XmkeAH1lTuc QLmoM1TxTH5CrhcGI0DkMvZj674WugMHp3HMQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=lJDjHruIh7gxfgVPdITlUJAqwWanJg8MsyMmPnYN4Ircp9mXCyhYdCq4P42jT/6tgz 1iMyBskvlpD5/hOTFercbus++3L1PmI0re4lTUOWi8apWZz1BCxw/FuhJHpJO0Azj6Gt N4Mm7MP7Q7wZe57HwmOR4wPqjRITHVp9ORe5Q= Received: by 10.142.213.2 with SMTP id l2mr2643596wfg.64.1290239754570; Fri, 19 Nov 2010 23:55:54 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id w27sm2962655wfd.14.2010.11.19.23.55.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 19 Nov 2010 23:55:53 -0800 (PST) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao Subject: [PATCH] netfilter: remove an atomic bit operation Date: Sat, 20 Nov 2010 15:55:17 +0800 Message-Id: <1290239717-12664-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As this ct won't be seen by the others, we don't need to set the IPS_CONFIRMED_BIT in atomic way. Signed-off-by: Changli Gao --- net/netfilter/nf_conntrack_core.c | 2 +- 1 file changed, 1 insertion(+), 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_core.c b/net/netfilter/nf_conntrack_core.c index 27a5ea6..c708248 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -486,7 +486,7 @@ __nf_conntrack_confirm(struct sk_buff *skb) ct->timeout.expires += jiffies; add_timer(&ct->timeout); atomic_inc(&ct->ct_general.use); - set_bit(IPS_CONFIRMED_BIT, &ct->status); + ct->status |= IPS_CONFIRMED_BIT; /* Since the lookup is lockless, hash insertion must be done after * starting the timer and setting the CONFIRMED bit. The RCU barriers