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 <[EMAIL PROTECTED]>
Signed-off-by: Sean Hefty <[EMAIL PROTECTED]>
Signed-off-by: Hal Rosenstock <[EMAIL PROTECTED]>
This patch depends on patch 16/27.
--
agent.c | 8 ++++--
verbs.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff -uprN linux-2.6.13-rc2-mm1/drivers/infiniband16/core/agent.c
linux-2.6.13-rc2-mm1/drivers/infiniband17/core/agent.c
-- linux-2.6.13-rc2-mm1/drivers/infiniband16/core/agent.c 2005-07-09
13:22:55.000000000 -0400
+++ linux-2.6.13-rc2-mm1/drivers/infiniband17/core/agent.c 2005-07-10
11:50:26.000000000 -0400
@@ -156,10 +156,10 @@ static int agent_mad_send(struct ib_mad_
/* 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 -uprN linux-2.6.13-rc2-mm1/drivers/infiniband16/core/verbs.c
linux-2.6.13-rc2-mm1/drivers/infiniband17/core/verbs.c
-- linux-2.6.13-rc2-mm1/drivers/infiniband16/core/verbs.c 2005-07-10
11:43:44.000000000 -0400
+++ linux-2.6.13-rc2-mm1/drivers/infiniband17/core/verbs.c 2005-07-10
11:50:26.000000000 -0400
@@ -113,7 +113,7 @@ struct ib_ah *ib_create_ah_from_wc(struc
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
