From patchwork Fri Oct 22 20:17:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arlin Davis X-Patchwork-Id: 277821 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9MKHfwh000301 for ; Fri, 22 Oct 2010 20:17:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757192Ab0JVURk (ORCPT ); Fri, 22 Oct 2010 16:17:40 -0400 Received: from mga09.intel.com ([134.134.136.24]:24617 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754984Ab0JVURk convert rfc822-to-8bit (ORCPT ); Fri, 22 Oct 2010 16:17:40 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 22 Oct 2010 13:17:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.58,225,1286175600"; d="scan'208";a="669963181" Received: from orsmsx603.amr.corp.intel.com ([10.22.226.49]) by orsmga001.jf.intel.com with ESMTP; 22 Oct 2010 13:17:39 -0700 Received: from orsmsx506.amr.corp.intel.com ([10.22.226.44]) by orsmsx603.amr.corp.intel.com ([10.22.226.49]) with mapi; Fri, 22 Oct 2010 13:17:39 -0700 From: "Davis, Arlin R" To: linux-rdma , "ofw@lists.openfabrics.org" Date: Fri, 22 Oct 2010 13:17:37 -0700 Subject: [PATCH] DAPL v2.0: cma: fix debug build issue Thread-Topic: [PATCH] DAPL v2.0: cma: fix debug build issue Thread-Index: ActyJiulaaOO13QVSS+F0hl2gyOs3g== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Oct 2010 20:17:44 +0000 (UTC) diff --git a/dapl/openib_cma/cm.c b/dapl/openib_cma/cm.c index 9338d55..1eb7aed 100644 --- a/dapl/openib_cma/cm.c +++ b/dapl/openib_cma/cm.c @@ -105,7 +105,6 @@ static void dapli_route_resolve(struct dapl_cm_id *conn) int ret; #ifdef DAPL_DBG struct rdma_addr *ipaddr = &conn->cm_id->route.addr; - struct ib_addr *ibaddr = &conn->cm_id->route.addr.addr.ibaddr; #endif dapl_dbg_log(DAPL_DBG_TYPE_CM, @@ -120,16 +119,16 @@ static void dapli_route_resolve(struct dapl_cm_id *conn) dapl_dbg_log(DAPL_DBG_TYPE_CM, " route_resolve: SRC GID subnet %016llx id %016llx\n", (unsigned long long) - ntohll(ibaddr->sgid.global.subnet_prefix), + ntohll(ipaddr->addr.ibaddr.sgid.global.subnet_prefix), (unsigned long long) - ntohll(ibaddr->sgid.global.interface_id)); + ntohll(ipaddr->addr.ibaddr.sgid.global.interface_id)); dapl_dbg_log(DAPL_DBG_TYPE_CM, " route_resolve: DST GID subnet %016llx id %016llx\n", (unsigned long long) - ntohll(ibaddr->dgid.global.subnet_prefix), + ntohll(ipaddr->addr.ibaddr.dgid.global.subnet_prefix), (unsigned long long) - ntohll(ibaddr->dgid.global.interface_id)); + ntohll(ipaddr->addr.ibaddr.dgid.global.interface_id)); dapl_dbg_log(DAPL_DBG_TYPE_CM, " route_resolve: cm_id %p pdata %p plen %d rr %d ind %d\n",