2 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index e4086ec8b952..50cab2a09f28 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -246,6 +246,7 @@ struct svc_deferred_req {
         u32                     prot;   /* protocol (UDP or TCP) */
         struct sockaddr_in      addr;
         struct svc_sock         *svsk;  /* where reply must go */
+        u32                     daddr;  /* where reply must come from */
         struct cache_deferred_req handle;
         int                     argslen;
         u32                     args[0];
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index e67613e4eb18..50580620e897 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1527,6 +1527,7 @@ svc_defer(struct cache_req *req)
                 dr->handle.owner = rqstp->rq_server;
                 dr->prot = rqstp->rq_prot;
                 dr->addr = rqstp->rq_addr;
+                dr->daddr = rqstp->rq_daddr;
                 dr->argslen = rqstp->rq_arg.len >> 2;
                 memcpy(dr->args, rqstp->rq_arg.head[0].iov_base-skip, dr->argslen<<2);
         }
@@ -1552,6 +1553,7 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
         rqstp->rq_arg.len = dr->argslen<<2;
         rqstp->rq_prot        = dr->prot;
         rqstp->rq_addr        = dr->addr;
+        rqstp->rq_daddr       = dr->daddr;
         return dr->argslen<<2;
 }