Messages in this thread Patch in this message | | | Date | Wed, 30 Apr 2008 22:38:39 +0200 | From | Ingo Molnar <> | Subject | [patch] net: ipv6 build fix |
| |
hi David,
* David Miller <davem@davemloft.net> wrote:
> net: Several cleanups for the setsockopt compat support. > net: Add compat support for getsockopt (MCAST_MSFILTER)
this broke !COMPAT builds in current -git. Fix below. NOTE: fix is just a quick guess.
Ingo
-----------------------> Subject: net: ipv6 build fix From: Ingo Molnar <mingo@elte.hu> Date: Wed Apr 30 22:32:09 CEST 2008
x86.git testing found the following build error on -git:
ERROR: "compat_mc_getsockopt" [net/ipv6/ipv6.ko] undefined!
with this config:
http://redhat.com/~mingo/misc/config-Wed_Apr_30_22_23_37_CEST_2008.bad
this hits on !COMPAT + IPV6 modular builds. It is caused by commit 42908c69f6 ("net: Add compat support for getsockopt (MCAST_MSFILTER)").
this fix here is just a quick guess - i _suspect_ that do_ipv6_getsockopt() will just DTRT and return -EINVAL but i havent checked. It obviously solves the build issue.
Signed-off-by: Ingo Molnar <mingo@elte.hu> --- net/ipv6/ipv6_sockglue.c | 2 ++ 1 file changed, 2 insertions(+)
Index: linux/net/ipv6/ipv6_sockglue.c =================================================================== --- linux.orig/net/ipv6/ipv6_sockglue.c +++ linux/net/ipv6/ipv6_sockglue.c @@ -1089,9 +1089,11 @@ int ipv6_getsockopt(struct sock *sk, int if(level != SOL_IPV6) return -ENOPROTOOPT; +#ifdef CONFIG_COMPAT if (optname == MCAST_MSFILTER) return compat_mc_getsockopt(sk, level, optname, optval, optlen, ipv6_getsockopt); +#endif err = do_ipv6_getsockopt(sk, level, optname, optval, optlen); #ifdef CONFIG_NETFILTER
| |