diff options
author | David L Stevens <dlstevens@us.ibm.com> | 2008-04-29 06:23:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-29 06:23:22 -0400 |
commit | 42908c69f61f75dd70e424263ab89ee52040382b (patch) | |
tree | 7c4333d2159d19cb33ae18f718259df258d7d137 /net/ipv4 | |
parent | be666e0a1345ed80f29cb30c73da0ec2ea5c5863 (diff) |
net: Add compat support for getsockopt (MCAST_MSFILTER)
This patch adds support for getsockopt for MCAST_MSFILTER for
both IPv4 and IPv6. It depends on the previous setsockopt patch,
and uses the same method.
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ip_sockglue.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 4d8d95404f45..e0514e82308e 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -1186,7 +1186,14 @@ int ip_getsockopt(struct sock *sk, int level, | |||
1186 | int compat_ip_getsockopt(struct sock *sk, int level, int optname, | 1186 | int compat_ip_getsockopt(struct sock *sk, int level, int optname, |
1187 | char __user *optval, int __user *optlen) | 1187 | char __user *optval, int __user *optlen) |
1188 | { | 1188 | { |
1189 | int err = do_ip_getsockopt(sk, level, optname, optval, optlen); | 1189 | int err; |
1190 | |||
1191 | if (optname == MCAST_MSFILTER) | ||
1192 | return compat_mc_getsockopt(sk, level, optname, optval, optlen, | ||
1193 | ip_getsockopt); | ||
1194 | |||
1195 | err = do_ip_getsockopt(sk, level, optname, optval, optlen); | ||
1196 | |||
1190 | #ifdef CONFIG_NETFILTER | 1197 | #ifdef CONFIG_NETFILTER |
1191 | /* we need to exclude all possible ENOPROTOOPTs except default case */ | 1198 | /* we need to exclude all possible ENOPROTOOPTs except default case */ |
1192 | if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS && | 1199 | if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS && |