From: Changli Gao <xiaosuo@gmail.com>
Date: Tue, 18 Jan 2011 14:02:48 +0000 (+0100)
Subject: netfilter: nf_nat: fix conversion to non-atomic bit ops
X-Git-Tag: v2.6.39-rc1~468^2~510^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7c2f4d7daf9bbea362763fa7353b1862a2487ad;p=pandora-kernel.git

netfilter: nf_nat: fix conversion to non-atomic bit ops

My previous patch (netfilter: nf_nat: don't use atomic bit operation)
made a mistake when converting atomic_set to a normal bit 'or'.
IPS_*_BIT should be replaced with IPS_*.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Cc: Tim Gardner <tim.gardner@canonical.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

Reading git-diff-tree failed