Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 5 insertions, 1 deletions

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 02c522c17de5..a564c1a39ec5 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -614,7 +614,11 @@ xprt_rdma_free(void *buffer)
                 return;
 
         req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]);
-        r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
+        if (req->rl_iov.length == 0) {  /* see allocate above */
+                r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer,
+                                      struct rpcrdma_xprt, rx_buf);
+        } else
+                r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
         rep = req->rl_reply;
 
         dprintk("RPC:       %s: called on 0x%p%s\n",