diff --git a/[refs] b/[refs] index e7dd14d32b33..ab4154f1794e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 360d873864c8903a650b227758b49dd50e6ecc9f +refs/heads/master: 9f29868b491beee706931e0cf875a60cb4688754 diff --git a/trunk/include/linux/sunrpc/svc.h b/trunk/include/linux/sunrpc/svc.h index 8531a70da73d..37f7448c997e 100644 --- a/trunk/include/linux/sunrpc/svc.h +++ b/trunk/include/linux/sunrpc/svc.h @@ -204,7 +204,10 @@ union svc_addr_u { struct svc_rqst { struct list_head rq_list; /* idle list */ struct list_head rq_all; /* all threads list */ - struct svc_sock * rq_sock; /* socket */ + union { + struct svc_xprt * rq_xprt; /* transport ptr */ + struct svc_sock * rq_sock; /* socket ptr */ + }; struct sockaddr_storage rq_addr; /* peer address */ size_t rq_addrlen;