diff options
| author | David L Stevens <dlstevens@us.ibm.com> | 2008-04-27 01:06:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-27 14:26:53 -0700 |
| commit | dae50295488f35d2d617b08a5fae43154c947eec (patch) | |
| tree | afee67a0e85f4a168e0bb75423f1b703f48baad3 /net/ipv6 | |
| parent | 01a2202c95989a4df48e9a5b5e013cb80c6b2d66 (diff) | |
| download | blackbird-op-linux-dae50295488f35d2d617b08a5fae43154c947eec.tar.gz blackbird-op-linux-dae50295488f35d2d617b08a5fae43154c947eec.zip | |
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
Add support on 64-bit kernels for seting 32-bit compatible MCAST*
socket options.
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 06de9d0e1f6b..db6fdc1498aa 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -52,6 +52,7 @@ #include <net/udp.h> #include <net/udplite.h> #include <net/xfrm.h> +#include <net/compat.h> #include <asm/uaccess.h> @@ -779,6 +780,10 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname, if (level != SOL_IPV6) return -ENOPROTOOPT; + if (optname >= MCAST_JOIN_GROUP && optname <= MCAST_MSFILTER) + return compat_mc_setsockopt(sk, level, optname, optval, optlen, + ipv6_setsockopt); + err = do_ipv6_setsockopt(sk, level, optname, optval, optlen); #ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ |
