From patchwork Thu Oct 1 23:09:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Smith, Stan" X-Patchwork-Id: 51050 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n91NIRib019592 for ; Thu, 1 Oct 2009 23:18:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755258AbZJAXKX (ORCPT ); Thu, 1 Oct 2009 19:10:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755254AbZJAXKX (ORCPT ); Thu, 1 Oct 2009 19:10:23 -0400 Received: from mga14.intel.com ([143.182.124.37]:9886 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754843AbZJAXKV convert rfc822-to-8bit (ORCPT ); Thu, 1 Oct 2009 19:10:21 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Oct 2009 16:10:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,489,1249282800"; d="scan'208";a="194197095" Received: from orsmsx602.amr.corp.intel.com ([10.22.226.211]) by azsmga001.ch.intel.com with ESMTP; 01 Oct 2009 16:09:43 -0700 Received: from orsmsx501.amr.corp.intel.com ([10.22.226.209]) by orsmsx602.amr.corp.intel.com ([10.22.226.211]) with mapi; Thu, 1 Oct 2009 16:09:43 -0700 From: "Smith, Stan" To: Sasha Khapyorsky CC: "ofw@lists.openfabrics.org" , linux-rdma Date: Thu, 1 Oct 2009 16:09:42 -0700 Subject: [PATCH] C++ style coding does not compile Thread-Topic: [PATCH] C++ style coding does not compile Thread-Index: AcpC7EKBCEvrOKgbSfCUDA6pM5j19g== Message-ID: <3F6F638B8D880340AB536D29CD4C1E1912C86E8BA3@orsmsx501.amr.corp.intel.com> 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 diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c index 2247ebe..1166def 100644 --- a/opensm/opensm/osm_sa_path_record.c +++ b/opensm/opensm/osm_sa_path_record.c @@ -1214,6 +1214,10 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa, if (!ib_gid_is_multicast(&p_pr->dgid) && ib_gid_get_subnet_prefix(&p_pr->dgid) != sa->p_subn->opt.subnet_prefix) { + + osm_prefix_route_t *route; + osm_prefix_route_t *r; + OSM_LOG(sa->p_log, OSM_LOG_VERBOSE, "Non local DGID subnet prefix 0x%016" PRIx64 "\n", @@ -1221,11 +1225,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa, /* Find the router port that is configured to handle this prefix, if any */ - osm_prefix_route_t *route = NULL; - osm_prefix_route_t *r = (osm_prefix_route_t *) - cl_qlist_head(&sa->p_subn-> - prefix_routes_list); - + route = NULL; + r = (osm_prefix_route_t *) cl_qlist_head( + &sa->p_subn->prefix_routes_list); while (r != (osm_prefix_route_t *) cl_qlist_end(&sa->p_subn-> prefix_routes_list)) {