diff options
author | Steve Wise <swise@opengridcomputing.com> | 2009-04-20 16:53:15 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2009-04-20 16:53:15 -0400 |
commit | 96ac7e88922da6ab33efea87c6b560ba5ab11e75 (patch) | |
tree | da84d3d855280ba138108249b0dfa22cae5ac8bb /drivers/infiniband | |
parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) |
RDMA/cxgb3: Adjust ORD/IRD (if needed) for peer2peer connections
NFS/RDMA currently fails to set up connections if peer2peer is on.
This is due to the fact that the NFS/RDMA client sets its ORD to 0.
If peer2peer is set, make sure the active side ORD is >= 1 and the
passive side IRD is >=1.
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_cm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index fef3f1ae7225..52d7bb0c2a12 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c | |||
@@ -1830,6 +1830,10 @@ int iwch_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) | |||
1830 | ep->com.rpl_err = 0; | 1830 | ep->com.rpl_err = 0; |
1831 | ep->ird = conn_param->ird; | 1831 | ep->ird = conn_param->ird; |
1832 | ep->ord = conn_param->ord; | 1832 | ep->ord = conn_param->ord; |
1833 | |||
1834 | if (peer2peer && ep->ird == 0) | ||
1835 | ep->ird = 1; | ||
1836 | |||
1833 | PDBG("%s %d ird %d ord %d\n", __func__, __LINE__, ep->ird, ep->ord); | 1837 | PDBG("%s %d ird %d ord %d\n", __func__, __LINE__, ep->ird, ep->ord); |
1834 | 1838 | ||
1835 | get_ep(&ep->com); | 1839 | get_ep(&ep->com); |
@@ -1915,6 +1919,10 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) | |||
1915 | conn_param->private_data, ep->plen); | 1919 | conn_param->private_data, ep->plen); |
1916 | ep->ird = conn_param->ird; | 1920 | ep->ird = conn_param->ird; |
1917 | ep->ord = conn_param->ord; | 1921 | ep->ord = conn_param->ord; |
1922 | |||
1923 | if (peer2peer && ep->ord == 0) | ||
1924 | ep->ord = 1; | ||
1925 | |||
1918 | ep->com.tdev = h->rdev.t3cdev_p; | 1926 | ep->com.tdev = h->rdev.t3cdev_p; |
1919 | 1927 | ||
1920 | cm_id->add_ref(cm_id); | 1928 | cm_id->add_ref(cm_id); |