diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-30 17:49:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-30 17:49:54 -0400 |
commit | 809917903127804c2b2ac76342ab0f29f4b394d3 (patch) | |
tree | edf76f1f853740f027d87f881035b41291d859d3 /net/ipv6 | |
parent | 159131149c2f56c1da5ae5e23ab9d5acef4916d1 (diff) |
ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.
The last hunk from the commit dae50295 (ipv4/ipv6 compat: Fix SSM
applications on 64bit kernels.) escaped from the compat_ipv6_setsockopt
to the ipv6_getsockopt (I guess due to patch smartness wrt searching
for context) thus breaking 32-bit and 64-bit-without-compat compilation.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index b4a26f2505f..56d55fecf8e 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
@@ -1089,10 +1089,6 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
1089 | if(level != SOL_IPV6) | 1089 | if(level != SOL_IPV6) |
1090 | return -ENOPROTOOPT; | 1090 | return -ENOPROTOOPT; |
1091 | 1091 | ||
1092 | if (optname == MCAST_MSFILTER) | ||
1093 | return compat_mc_getsockopt(sk, level, optname, optval, optlen, | ||
1094 | ipv6_getsockopt); | ||
1095 | |||
1096 | err = do_ipv6_getsockopt(sk, level, optname, optval, optlen); | 1092 | err = do_ipv6_getsockopt(sk, level, optname, optval, optlen); |
1097 | #ifdef CONFIG_NETFILTER | 1093 | #ifdef CONFIG_NETFILTER |
1098 | /* we need to exclude all possible ENOPROTOOPTs except default case */ | 1094 | /* we need to exclude all possible ENOPROTOOPTs except default case */ |
@@ -1131,6 +1127,10 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
1131 | if (level != SOL_IPV6) | 1127 | if (level != SOL_IPV6) |
1132 | return -ENOPROTOOPT; | 1128 | return -ENOPROTOOPT; |
1133 | 1129 | ||
1130 | if (optname == MCAST_MSFILTER) | ||
1131 | return compat_mc_getsockopt(sk, level, optname, optval, optlen, | ||
1132 | ipv6_getsockopt); | ||
1133 | |||
1134 | err = do_ipv6_getsockopt(sk, level, optname, optval, optlen); | 1134 | err = do_ipv6_getsockopt(sk, level, optname, optval, optlen); |
1135 | #ifdef CONFIG_NETFILTER | 1135 | #ifdef CONFIG_NETFILTER |
1136 | /* we need to exclude all possible ENOPROTOOPTs except default case */ | 1136 | /* we need to exclude all possible ENOPROTOOPTs except default case */ |