IB/hfi1: Remove pmtu from the QP structure

The pmtu field doens't have be stored in the QP structure
as it can easily be calculated when needed.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 1878a97..eb0c3d6 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -1243,7 +1243,6 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
        if (attr_mask & IB_QP_PATH_MTU) {
                qp->pmtu = rdi->driver_f.mtu_from_qp(rdi, qp, pmtu);
-               qp->path_mtu = rdi->driver_f.mtu_to_path_mtu(qp->pmtu);
                qp->log_pmtu = ilog2(qp->pmtu);
        }
 
@@ -1366,7 +1365,7 @@ int rvt_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
        attr->qp_state = qp->state;
        attr->cur_qp_state = attr->qp_state;
-       attr->path_mtu = qp->path_mtu;
+       attr->path_mtu = rdi->driver_f.mtu_to_path_mtu(qp->pmtu);
        attr->path_mig_state = qp->s_mig_state;
        attr->qkey = qp->qkey;
        attr->rq_psn = qp->r_psn & rdi->dparms.psn_mask;

diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 07e2fff..8fbafb0 100644 (file)
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -277,7 +277,6 @@ struct rvt_qp {
 
        unsigned long timeout_jiffies;  /* computed from timeout */
 
-       enum ib_mtu path_mtu;
        int srate_mbps;         /* s_srate (below) converted to Mbit/s */
        pid_t pid;              /* pid for user mode QPs */
        u32 remote_qpn;