]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbabf31) | patch
netfilter: nf_nat: fix conversion to non-atomic bit ops
authorChangli Gao <xiaosuo@gmail.com>
Tue, 18 Jan 2011 14:02:48 +0000 (15:02 +0100)
committerPatrick McHardy <kaber@trash.net>
Tue, 18 Jan 2011 14:02:48 +0000 (15:02 +0100)
commita7c2f4d7daf9bbea362763fa7353b1862a2487ad
tree84dfadd50d341c86615f58712b86684ec8ebf2d1tree
parentfbabf31e4d482149b5e2704eb0287cf9117bdcf3commit | diff
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>
include/net/netfilter/nf_nat_core.h diff | blob | blame | history
net/ipv4/netfilter/nf_nat_core.c diff | blob | blame | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG