diff --git a/[refs] b/[refs]
index 502e81168e55..8be69d18c7e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c9749c3b534ea0e606b7ee2c29849bbb8d5b0a9
+refs/heads/master: 6d2fad0472ca0d6caba7c36d2823a527e2a0e4f5
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_ruc.c b/trunk/drivers/infiniband/hw/ipath/ipath_ruc.c
index d9c2a9b15d86..8c5d20a4b5f3 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_ruc.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_ruc.c
@@ -267,7 +267,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
 	spin_lock_irqsave(&sqp->s_lock, flags);
 
 	if (!(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_SEND_OK) ||
-	    qp->s_rnr_timeout) {
+	    sqp->s_rnr_timeout) {
 		spin_unlock_irqrestore(&sqp->s_lock, flags);
 		goto done;
 	}