From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262686AbVGKUkA (ORCPT ); Mon, 11 Jul 2005 16:40:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262673AbVGKUjt (ORCPT ); Mon, 11 Jul 2005 16:39:49 -0400 Received: from mailgw.voltaire.com ([212.143.27.70]:26317 "EHLO mailgw.voltaire.com") by vger.kernel.org with ESMTP id S262656AbVGKUhX (ORCPT ); Mon, 11 Jul 2005 16:37:23 -0400 Subject: [PATCH 17/29v2] A couple of IB core bug fixes From: Hal Rosenstock To: Andrew Morton Cc: linux-kernel@vger.kernel.org, openib-general@openib.org Content-Type: text/plain Organization: Message-Id: <1121110334.4389.5018.camel@hal.voltaire.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-4) Date: 11 Jul 2005 16:29:45 -0400 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock This patch depends on patch 16/29. -- agent.c | 8 ++++-- verbs.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff -uprN linux-2.6.13-rc2-mm1-16/drivers/infiniband/core/agent.c linux-2.6.13-rc2-mm1-17/drivers/infiniband/core/agent.c -- linux-2.6.13-rc2-mm1-16/drivers/infiniband/core/agent.c 2005-07-09 13:22:55.000000000 -0400 +++ linux-2.6.13-rc2-mm1-17/drivers/infiniband/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-16/drivers/infiniband/core/verbs.c linux-2.6.13-rc2-mm1-17/drivers/infiniband/core/verbs.c -- linux-2.6.13-rc2-mm1-16/drivers/infiniband/core/verbs.c 2005-07-10 11:43:44.000000000 -0400 +++ linux-2.6.13-rc2-mm1-17/drivers/infiniband/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;