[PATCH] IB: A couple of IB core bug fixes

Replace be32_to_cpup with be32_to_cpu and fix bug referencing pointer rather
than value in ib_create_ah_from_wc().

Signed-off-by: Tom Duffy <tduffy@sun.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index dde25ee81b6547255958c0056781c8207ab6a0b1..729f0b0d983a0fe91abae6f54c4545ec77522919 100644 (file)
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -156,10 +156,10 @@ static int agent_mad_send(struct ib_mad_agent *mad_agent,
                        /* Should sgid be looked up ? */
                        ah_attr.grh.sgid_index = 0;
                        ah_attr.grh.hop_limit = grh->hop_limit;
-                       ah_attr.grh.flow_label = be32_to_cpup(
-                               &grh->version_tclass_flow)  & 0xfffff;
-                       ah_attr.grh.traffic_class = (be32_to_cpup(
-                               &grh->version_tclass_flow) >> 20) & 0xff;
+                       ah_attr.grh.flow_label = be32_to_cpu(
+                               grh->version_tclass_flow)  & 0xfffff;
+                       ah_attr.grh.traffic_class = (be32_to_cpu(
+                               grh->version_tclass_flow) >> 20) & 0xff;
                        memcpy(ah_attr.grh.dgid.raw,
                               grh->sgid.raw,
                               sizeof(ah_attr.grh.dgid));

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 62951594eec65c4fa787384d7c444818efe2d24d..506fdf1f2a268de31fe957f7c362fb7ae7d1e1f9 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -113,7 +113,7 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,
                        return ERR_PTR(ret);
 
                ah_attr.grh.sgid_index = (u8) gid_index;
-               flow_class = be32_to_cpu(&grh->version_tclass_flow);
+               flow_class = be32_to_cpu(grh->version_tclass_flow);
                ah_attr.grh.flow_label = flow_class & 0xFFFFF;
                ah_attr.grh.traffic_class = (flow_class >> 20) & 0xFF;
                ah_attr.grh.hop_limit = grh->hop_limit;