diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-28 07:12:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-28 20:11:45 +0200 |
| commit | 9b115749acb24d11083ded4fe947ddd654a940e3 (patch) | |
| tree | 8667571df0465bf10b1d72a641df77ac916dd773 /net/sunrpc/svcsock.c | |
| parent | ipv4: add ip_sock_set_pktinfo (diff) | |
| download | linux-9b115749acb24d11083ded4fe947ddd654a940e3.tar.xz linux-9b115749acb24d11083ded4fe947ddd654a940e3.zip | |
ipv6: add ip6_sock_set_v6only
Add a helper to directly set the IPV6_V6ONLY sockopt from kernel space
without going through a fake uaccess.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 7a805d165689..a391892977cd 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1328,7 +1328,6 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *serv, struct sockaddr *newsin = (struct sockaddr *)&addr; int newlen; int family; - int val; RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]); dprintk("svc: svc_create_socket(%s, %d, %s)\n", @@ -1364,11 +1363,8 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *serv, * getting requests from IPv4 remotes. Those should * be shunted to a PF_INET listener via rpcbind. */ - val = 1; if (family == PF_INET6) - kernel_setsockopt(sock, SOL_IPV6, IPV6_V6ONLY, - (char *)&val, sizeof(val)); - + ip6_sock_set_v6only(sock->sk); if (type == SOCK_STREAM) sock->sk->sk_reuse = SK_CAN_REUSE; /* allow address reuse */ error = kernel_bind(sock, sin, len); |