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>

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index af3c5f564d606a0a4df8571b5065fd17da7494ba..6a62b2372fba06dafbcdf5b3d5d134aeae3f36de 100644 (file)
--- 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,
                                enum ib_qp_state old_qps)
 {
        int status = 0;
-       struct net_device *netdev = qp->dev->nic_info.netdev;
-       int eth_mtu = iboe_get_mtu(netdev->mtu);
 
        if (attr_mask & IB_QP_PKEY_INDEX) {
                cmd->params.path_mtu_pkey_indx |= (attrs->pkey_index &
@@ -2140,8 +2138,8 @@ static int ocrdma_set_qp_params(struct ocrdma_qp *qp,
                cmd->flags |= OCRDMA_QP_PARA_DST_QPN_VALID;
        }
        if (attr_mask & IB_QP_PATH_MTU) {
-               if (ib_mtu_enum_to_int(eth_mtu) <
-                   ib_mtu_enum_to_int(attrs->path_mtu)) {
+               if (attrs->path_mtu < IB_MTU_256 ||
+                   attrs->path_mtu > IB_MTU_4096) {
                        status = -EINVAL;
                        goto pmtu_err;
                }

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index ffa5511baf3cad6c04275ccbf3d17fa92b76f1a9..7698572b79fba011a9f17011308f6e35b305e32b 100644 (file)
--- 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)
        attr->vendor_part_id = dev->nic_info.pdev->device;
        attr->hw_ver = 0;
        attr->max_qp = dev->attr.max_qp;
-       attr->max_ah = dev->attr.max_qp;
+       attr->max_ah = OCRDMA_MAX_AH;
        attr->max_qp_wr = dev->attr.max_wqe;
 
        attr->device_cap_flags = IB_DEVICE_CURR_QP_STATE_MOD |