projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[linux-2.6-microblaze.git]
/
drivers
/
infiniband
/
hw
/
hfi1
/
rc.c
diff --git
a/drivers/infiniband/hw/hfi1/rc.c
b/drivers/infiniband/hw/hfi1/rc.c
index
9db260f
..
809b26e
100644
(file)
--- a/
drivers/infiniband/hw/hfi1/rc.c
+++ b/
drivers/infiniband/hw/hfi1/rc.c
@@
-89,7
+89,7
@@
void hfi1_add_rnr_timer(struct rvt_qp *qp, u32 to)
lockdep_assert_held(&qp->s_lock);
qp->s_flags |= RVT_S_WAIT_RNR;
-
qp->s
_timer.expires = jiffies + usecs_to_jiffies(to);
+
priv->s_rnr
_timer.expires = jiffies + usecs_to_jiffies(to);
add_timer(&priv->s_rnr_timer);
}