summaryrefslogtreecommitdiffstats
path: root/net/compat.c
diff options
context:
space:
mode:
authorDmitry Mishin <dim@openvz.org>2006-04-01 12:25:19 +0200
committerDavid S. Miller <davem@davemloft.net>2006-04-01 12:25:19 +0200
commit2722971cbe831117686039d5c334f2c0f560be13 (patch)
treeb810ea96778e4f5de2a7713685c0551aa34c8f97 /net/compat.c
parent[NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration (diff)
downloadlinux-2722971cbe831117686039d5c334f2c0f560be13.tar.xz
linux-2722971cbe831117686039d5c334f2c0f560be13.zip
[NETFILTER]: iptables 32bit compat layer
This patch extends current iptables compatibility layer in order to get 32bit iptables to work on 64bit kernel. Current layer is insufficient due to alignment checks both in kernel and user space tools. Patch is for current net-2.6.17 with addition of move of ipt_entry_{match| target} definitions to xt_entry_{match|target}. Signed-off-by: Dmitry Mishin <dim@openvz.org> Acked-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/compat.c')
-rw-r--r--net/compat.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c
index 8fd37cd7b501..d5d69fa15d07 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -476,8 +476,7 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname,
int err;
struct socket *sock;
- /* SO_SET_REPLACE seems to be the same in all levels */
- if (optname == IPT_SO_SET_REPLACE)
+ if (level == SOL_IPV6 && optname == IPT_SO_SET_REPLACE)
return do_netfilter_replace(fd, level, optname,
optval, optlen);