From patchwork Sun Nov 21 00:13:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 72366 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 BCF1DB7170 for ; Sun, 21 Nov 2010 11:14:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753587Ab0KUAOO (ORCPT ); Sat, 20 Nov 2010 19:14:14 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:48372 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752610Ab0KUAON (ORCPT ); Sat, 20 Nov 2010 19:14:13 -0500 Received: by pwj1 with SMTP id 1so938256pwj.19 for ; Sat, 20 Nov 2010 16:14:13 -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=ha21srs6kRMoOFb3ofQL87gj6veO3Qyyk+x/l306zh4=; b=LQqVryROoMX8G4qyjons7nPN9gtABBMpwiBFql4D3io+Z33crB5H5+6fA28jyZTr+4 aw6X8iykjKIZGk752CammxW/beWdAu8VL4p1o/0YfaZ6kS9obq8nkGC9ZTyw0jpECp4Q wcdVo2o5HRTuKrjWxEkS3l1tAxycvPUYowsOs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=nXnxKrVitKUqdAwTl5bcKLl+QZ6VO68aTPCTTwWabRHBaBRLSFQbKUaVvj4puMttol 9n932BJufnxXam2zeH+U0v/H0D4DV/ClsiDgzqSAD3D0Oij0fhGSHx9JmV9dFn9FOdWr 1GKKz9wHqUwlE9x8XL17tG4P9DjO+4Xya2NqA= Received: by 10.142.194.4 with SMTP id r4mr3204244wff.264.1290298453154; Sat, 20 Nov 2010 16:14:13 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id p8sm4076484wff.4.2010.11.20.16.14.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 20 Nov 2010 16:14:11 -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] netfilter: change IPS_*_BIT to IPS_* Date: Sun, 21 Nov 2010 08:13:15 +0800 Message-Id: <1290298395-20160-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; }