From patchwork Sat Jan 15 11:20:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 79046 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 9D84BB6F10 for ; Sat, 15 Jan 2011 22:21:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752443Ab1AOLV1 (ORCPT ); Sat, 15 Jan 2011 06:21:27 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:40773 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035Ab1AOLVZ (ORCPT ); Sat, 15 Jan 2011 06:21:25 -0500 Received: by iyj18 with SMTP id 18so3255220iyj.19 for ; Sat, 15 Jan 2011 03:21:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=ha21srs6kRMoOFb3ofQL87gj6veO3Qyyk+x/l306zh4=; b=mFGC3B2LTVS7HlYjc63H2Llkvnnt/ZC69XA2xc8jM9RFwGHgMuPmHj1CCyGr5Xsx2t bQpuo0ic9XMf28HIeGV9InjQTvHd5yPIk3+MmASC+N384MZ4CV3XqsASreLkAeJwdIYV 8SaqxT4AlzbE67QMLvFx2VUx4J7UvU0sDtIGE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=pAHCVPuxzFyCwuTPFGvQOVqh31+64kINR2p4tds4lVP/UuOEBTBJGubcAmzOFHKBi5 5G7Mp339lRGaEFmZ93Awt6YASw+4Shju07vx4c4uU8ubZThX0aSx+OA9sdxmNuaHYJve nP+LRUFgh2SKrooJmuMQYNOKUNbStbzHTfQm8= Received: by 10.42.167.73 with SMTP id r9mr2038680icy.26.1295090485173; Sat, 15 Jan 2011 03:21:25 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id ca7sm1677802icb.0.2011.01.15.03.21.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 15 Jan 2011 03:21:23 -0800 (PST) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao , Tim Gardner , Eric Dumazet Subject: [PATCH resend] netfilter: change IPS_*_BIT to IPS_* Date: Sat, 15 Jan 2011 19:20:45 +0800 Message-Id: <1295090445-14431-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 My previous patch made a mistake when converting atomic_set to a normal bit 'or'. IPS_*_BIT should be replaced with IPS_*. commit 76a2d3bcfcc86e2a8044258515b86492a37631a3 Author: Changli Gao Date: Mon Nov 15 11:59:03 2010 +0100 netfilter: nf_nat: don't use atomic bit operation As we own the conntrack and the others can't see it until we confirm it, we don't need to use atomic bit operation on ct->status. Signed-off-by: Changli Gao Cc: Tim Gardner Cc: Eric Dumazet --- include/net/netfilter/nf_nat_core.h | 4 ++-- net/ipv4/netfilter/nf_nat_core.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 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/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h index 5aec85c..3dc7b98 100644 --- a/include/net/netfilter/nf_nat_core.h +++ b/include/net/netfilter/nf_nat_core.h @@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct, enum nf_nat_manip_type manip) { if (manip == IP_NAT_MANIP_SRC) - return ct->status & IPS_SRC_NAT_DONE_BIT; + return ct->status & IPS_SRC_NAT_DONE; else - return ct->status & IPS_DST_NAT_DONE_BIT; + return ct->status & IPS_DST_NAT_DONE; } struct nlattr; diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index eb55835..21e6e92 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -323,9 +323,9 @@ nf_nat_setup_info(struct nf_conn *ct, /* It's done. */ if (maniptype == IP_NAT_MANIP_DST) - ct->status |= IPS_DST_NAT_DONE_BIT; + ct->status |= IPS_DST_NAT_DONE; else - ct->status |= IPS_SRC_NAT_DONE_BIT; + ct->status |= IPS_SRC_NAT_DONE; return NF_ACCEPT; }