summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-03-07 23:45:44 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-03-26 14:00:28 +0200
commitf3d229c68bb47170f04f81e51c9ed5d4286cebdb (patch)
tree9c3876f0fe7d7936c5b2c141456ab69e17bed670
parent1d5c88e3f5403c1910477e4bcc71c3d5d40de6d5 (diff)
downloadlinux-3.10-f3d229c68bb47170f04f81e51c9ed5d4286cebdb.tar.gz
linux-3.10-f3d229c68bb47170f04f81e51c9ed5d4286cebdb.tar.bz2
linux-3.10-f3d229c68bb47170f04f81e51c9ed5d4286cebdb.zip
netfilter: xt_LOG: don't use xchg() for simple assignment
At least on ia64 the (bogus) use of xchg() here results in the compiler warning about an unused expression result. As only an assignment is intended here, convert it to such. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/net/netfilter/xt_log.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
index 7e1544e8f70..9d9756cca01 100644
--- a/include/net/netfilter/xt_log.h
+++ b/include/net/netfilter/xt_log.h
@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)
if (likely(m != &emergency))
kfree(m);
else {
- xchg(&emergency_ptr, m);
+ emergency_ptr = m;
local_bh_enable();
}
}