diff options
author | Naresh Gottumukkala <bgottumukkala@emulex.com> | 2013-08-26 05:57:40 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-09-03 00:17:53 -0400 |
commit | d3cb6c0b2a0d9f507fff8d7c74b2b334d6751bee (patch) | |
tree | 52e0e0f9c157edaeb7c0eaa85b75ac5eb3739e87 | |
parent | 7c33880c3cb2cda816d4d64852c6a81018b9bc1f (diff) |
RDMA/ocrdma: Remove the MTU check based on Ethernet MTU
Also increase MAX AH to 512.
Signed-off-by: Naresh Gottumukkala <bgottumukkala@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 6 | ||||
-rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index af3c5f564d60..6a62b2372fba 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c | |||
@@ -2102,8 +2102,6 @@ static int ocrdma_set_qp_params(struct ocrdma_qp *qp, | |||
2102 | enum ib_qp_state old_qps) | 2102 | enum ib_qp_state old_qps) |
2103 | { | 2103 | { |
2104 | int status = 0; | 2104 | int status = 0; |
2105 | struct net_device *netdev = qp->dev->nic_info.netdev; | ||
2106 | int eth_mtu = iboe_get_mtu(netdev->mtu); | ||
2107 | 2105 | ||
2108 | if (attr_mask & IB_QP_PKEY_INDEX) { | 2106 | if (attr_mask & IB_QP_PKEY_INDEX) { |
2109 | cmd->params.path_mtu_pkey_indx |= (attrs->pkey_index & | 2107 | cmd->params.path_mtu_pkey_indx |= (attrs->pkey_index & |
@@ -2140,8 +2138,8 @@ static int ocrdma_set_qp_params(struct ocrdma_qp *qp, | |||
2140 | cmd->flags |= OCRDMA_QP_PARA_DST_QPN_VALID; | 2138 | cmd->flags |= OCRDMA_QP_PARA_DST_QPN_VALID; |
2141 | } | 2139 | } |
2142 | if (attr_mask & IB_QP_PATH_MTU) { | 2140 | if (attr_mask & IB_QP_PATH_MTU) { |
2143 | if (ib_mtu_enum_to_int(eth_mtu) < | 2141 | if (attrs->path_mtu < IB_MTU_256 || |
2144 | ib_mtu_enum_to_int(attrs->path_mtu)) { | 2142 | attrs->path_mtu > IB_MTU_4096) { |
2145 | status = -EINVAL; | 2143 | status = -EINVAL; |
2146 | goto pmtu_err; | 2144 | goto pmtu_err; |
2147 | } | 2145 | } |
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index ffa5511baf3c..7698572b79fb 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | |||
@@ -75,7 +75,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr) | |||
75 | attr->vendor_part_id = dev->nic_info.pdev->device; | 75 | attr->vendor_part_id = dev->nic_info.pdev->device; |
76 | attr->hw_ver = 0; | 76 | attr->hw_ver = 0; |
77 | attr->max_qp = dev->attr.max_qp; | 77 | attr->max_qp = dev->attr.max_qp; |
78 | attr->max_ah = dev->attr.max_qp; | 78 | attr->max_ah = OCRDMA_MAX_AH; |
79 | attr->max_qp_wr = dev->attr.max_wqe; | 79 | attr->max_qp_wr = dev->attr.max_wqe; |
80 | 80 | ||
81 | attr->device_cap_flags = IB_DEVICE_CURR_QP_STATE_MOD | | 81 | attr->device_cap_flags = IB_DEVICE_CURR_QP_STATE_MOD | |