Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc75184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.
parents 214b7049 80991790

net/ipv6/ipv6_sockglue.c

+4 −4
Original line number Diff line number Diff line
@@ -1089,10 +1089,6 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, 
	if(level != SOL_IPV6)

		return -ENOPROTOOPT;



	if (optname == MCAST_MSFILTER)

		return compat_mc_getsockopt(sk, level, optname, optval, optlen,

			ipv6_getsockopt);



	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);

#ifdef CONFIG_NETFILTER

	/* 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, 
	if (level != SOL_IPV6)

		return -ENOPROTOOPT;



	if (optname == MCAST_MSFILTER)

		return compat_mc_getsockopt(sk, level, optname, optval, optlen,

			ipv6_getsockopt);



	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);

#ifdef CONFIG_NETFILTER

	/* we need to exclude all possible ENOPROTOOPTs except default case */