diff options
author | Aime Le Rouzic <aime.le-rouzic@bull.net> | 2010-01-26 14:03:56 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-01-26 17:55:56 -0500 |
commit | 205ba42308729f4f41f21d314a4435e7de5c9a2e (patch) | |
tree | 0b7f9ac0f79e2bb1a53fb06624b987f8640b282b /net/sunrpc | |
parent | 07396051a5c6901693a97e35cb731a01b0b348e4 (diff) |
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>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/svcsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 870929e08e5d..9e093910c479 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -1357,7 +1357,7 @@ int svc_addsock(struct svc_serv *serv, const int fd, char *name_return, | |||
1357 | 1357 | ||
1358 | if (!so) | 1358 | if (!so) |
1359 | return err; | 1359 | return err; |
1360 | if (so->sk->sk_family != AF_INET) | 1360 | if ((so->sk->sk_family != PF_INET) && (so->sk->sk_family != PF_INET6)) |
1361 | err = -EAFNOSUPPORT; | 1361 | err = -EAFNOSUPPORT; |
1362 | else if (so->sk->sk_protocol != IPPROTO_TCP && | 1362 | else if (so->sk->sk_protocol != IPPROTO_TCP && |
1363 | so->sk->sk_protocol != IPPROTO_UDP) | 1363 | so->sk->sk_protocol != IPPROTO_UDP) |