commit 205ba42308729f4f41f21d314a4435e7de5c9a2e
author Aime Le Rouzic <aime.le-rouzic@bull.net> Tue Jan 26 14:03:56 2010 -0500
committer J. Bruce Fields <bfields@citi.umich.edu> Tue Jan 26 17:55:56 2010 -0500
tree 0b7f9ac0f79e2bb1a53fb06624b987f8640b282b
parent 07396051a5c6901693a97e35cb731a01b0b348e4

NFSD: Support AF_INET6 in svc_addsock() function

Relax the address family check at the top of svc_addsock() to allow AF_INET6
listener sockets to be specified via /proc/fs/nfsd/portlist.

Signed-off-by: Aime Le Rouzic <aime.le-rouzic@bull.net>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

net/sunrpc/svcsock.c

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 870929e..9e09391 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1357,7 +1357,7 @@
 
 	if (!so)
 		return err;
-	if (so->sk->sk_family != AF_INET)
+	if ((so->sk->sk_family != PF_INET) && (so->sk->sk_family != PF_INET6))
 		err =  -EAFNOSUPPORT;
 	else if (so->sk->sk_protocol != IPPROTO_TCP &&
 	    so->sk->sk_protocol != IPPROTO_UDP)