diff options
| -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 b4a26f2505f8..56d55fecf8ec 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 */ | 
