| Message ID | 1432109615-19564-2-git-send-email-ira.weiny@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, May 20, 2015 at 04:13:22AM -0400, ira.weiny@intel.com wrote: > From: Ira Weiny <ira.weiny@intel.com> > > ib_find_send_mad only needs access to the MAD header. Change the local > variable to ib_mad_hdr and change the corresponding cast. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > drivers/infiniband/core/mad.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c > index 600af266838c..deefe5df9697 100644 > +++ b/drivers/infiniband/core/mad.c > @@ -1815,18 +1815,18 @@ ib_find_send_mad(const struct ib_mad_agent_private *mad_agent_priv, > const struct ib_mad_recv_wc *wc) > { > struct ib_mad_send_wr_private *wr; > - struct ib_mad *mad; > + struct ib_mad_hdr *mad_hdr; const > - mad = (struct ib_mad *)wc->recv_buf.mad; > + mad_hdr = (struct ib_mad_hdr *)wc->recv_buf.mad; This casts away const. Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 20, 2015 at 12:22:21PM -0600, Jason Gunthorpe wrote: > On Wed, May 20, 2015 at 04:13:22AM -0400, ira.weiny@intel.com wrote: > > From: Ira Weiny <ira.weiny@intel.com> > > > > ib_find_send_mad only needs access to the MAD header. Change the local > > variable to ib_mad_hdr and change the corresponding cast. > > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > drivers/infiniband/core/mad.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c > > index 600af266838c..deefe5df9697 100644 > > +++ b/drivers/infiniband/core/mad.c > > @@ -1815,18 +1815,18 @@ ib_find_send_mad(const struct ib_mad_agent_private *mad_agent_priv, > > const struct ib_mad_recv_wc *wc) > > { > > struct ib_mad_send_wr_private *wr; > > - struct ib_mad *mad; > > + struct ib_mad_hdr *mad_hdr; > > const > > > - mad = (struct ib_mad *)wc->recv_buf.mad; > > + mad_hdr = (struct ib_mad_hdr *)wc->recv_buf.mad; > > This casts away const. Fixed. Ira -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 20, 2015 at 12:22:21PM -0600, Jason Gunthorpe wrote: > On Wed, May 20, 2015 at 04:13:22AM -0400, ira.weiny@intel.com wrote: > > From: Ira Weiny <ira.weiny@intel.com> > > > > ib_find_send_mad only needs access to the MAD header. Change the local > > variable to ib_mad_hdr and change the corresponding cast. > > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > drivers/infiniband/core/mad.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c > > index 600af266838c..deefe5df9697 100644 > > +++ b/drivers/infiniband/core/mad.c > > @@ -1815,18 +1815,18 @@ ib_find_send_mad(const struct ib_mad_agent_private *mad_agent_priv, > > const struct ib_mad_recv_wc *wc) > > { > > struct ib_mad_send_wr_private *wr; > > - struct ib_mad *mad; > > + struct ib_mad_hdr *mad_hdr; > > const > > > - mad = (struct ib_mad *)wc->recv_buf.mad; > > + mad_hdr = (struct ib_mad_hdr *)wc->recv_buf.mad; > > This casts away const. Fixed Ira -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 600af266838c..deefe5df9697 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -1815,18 +1815,18 @@ ib_find_send_mad(const struct ib_mad_agent_private *mad_agent_priv, const struct ib_mad_recv_wc *wc) { struct ib_mad_send_wr_private *wr; - struct ib_mad *mad; + struct ib_mad_hdr *mad_hdr; - mad = (struct ib_mad *)wc->recv_buf.mad; + mad_hdr = (struct ib_mad_hdr *)wc->recv_buf.mad; list_for_each_entry(wr, &mad_agent_priv->wait_list, agent_list) { - if ((wr->tid == mad->mad_hdr.tid) && + if ((wr->tid == mad_hdr->tid) && rcv_has_same_class(wr, wc) && /* * Don't check GID for direct routed MADs. * These might have permissive LIDs. */ - (is_direct(wc->recv_buf.mad->mad_hdr.mgmt_class) || + (is_direct(mad_hdr->mgmt_class) || rcv_has_same_gid(mad_agent_priv, wr, wc))) return (wr->status == IB_WC_SUCCESS) ? wr : NULL; } @@ -1837,14 +1837,14 @@ ib_find_send_mad(const struct ib_mad_agent_private *mad_agent_priv, */ list_for_each_entry(wr, &mad_agent_priv->send_list, agent_list) { if (is_rmpp_data_mad(mad_agent_priv, wr->send_buf.mad) && - wr->tid == mad->mad_hdr.tid && + wr->tid == mad_hdr->tid && wr->timeout && rcv_has_same_class(wr, wc) && /* * Don't check GID for direct routed MADs. * These might have permissive LIDs. */ - (is_direct(wc->recv_buf.mad->mad_hdr.mgmt_class) || + (is_direct(mad_hdr->mgmt_class) || rcv_has_same_gid(mad_agent_priv, wr, wc))) /* Verify request has not been canceled */ return (wr->status == IB_WC_SUCCESS) ? wr : NULL;