[PATCH] knfsd: SUNRPC: Make rq_daddr field address-version independent

The rq_daddr field must support larger addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index b11669670baa..9d7a819149ce 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -484,7 +484,7 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
                 cmh->cmsg_level = SOL_IP;
                 cmh->cmsg_type = IP_PKTINFO;
                 pki->ipi_ifindex = 0;
-                pki->ipi_spec_dst.s_addr = rqstp->rq_daddr;
+                pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;
 
                 if (sock_sendmsg(sock, &msg, 0) < 0)
                         goto out;
@@ -763,7 +763,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
         rqstp->rq_addrlen = sizeof(struct sockaddr_in);
 
         /* Remember which interface received this request */
-        rqstp->rq_daddr = skb->nh.iph->daddr;
+        rqstp->rq_daddr.addr.s_addr = skb->nh.iph->daddr;
 
         if (skb_is_nonlinear(skb)) {
                 /* we have to copy */