From patchwork Wed Jun 16 17:21: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: 106532 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5GHLOpc025448 for ; Wed, 16 Jun 2010 17:21:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759298Ab0FPRVr (ORCPT ); Wed, 16 Jun 2010 13:21:47 -0400 Received: from mga03.intel.com ([143.182.124.21]:5365 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759293Ab0FPRVq convert rfc822-to-8bit (ORCPT ); Wed, 16 Jun 2010 13:21:46 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 16 Jun 2010 10:21:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,427,1272870000"; d="scan'208";a="289625672" Received: from orsmsx604.amr.corp.intel.com ([10.22.226.87]) by azsmga001.ch.intel.com with ESMTP; 16 Jun 2010 10:21:45 -0700 Received: from orsmsx002.amr.corp.intel.com (10.22.226.105) by orsmsx604.amr.corp.intel.com (10.22.226.87) with Microsoft SMTP Server (TLS) id 8.2.176.0; Wed, 16 Jun 2010 10:21:38 -0700 Received: from orsmsx506.amr.corp.intel.com ([10.22.226.44]) by orsmsx002.amr.corp.intel.com ([10.22.226.105]) with mapi; Wed, 16 Jun 2010 10:21:38 -0700 From: "Davis, Arlin R" To: "linux-rdma@vger.kernel.org" , ofw_list Date: Wed, 16 Jun 2010 10:21:37 -0700 Subject: [PATCH 4/5] dapl-2.0 - cma: remove dependency on rdma_cma_abi.h Thread-Topic: [PATCH 4/5] dapl-2.0 - cma: remove dependency on rdma_cma_abi.h Thread-Index: AcsNeGB9+6h9psMfQv+nG5RAItnhfA== 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 (demeter.kernel.org [140.211.167.41]); Wed, 16 Jun 2010 17:21:48 +0000 (UTC) diff --git a/dapl/openib_cma/dapl_ib_util.h b/dapl/openib_cma/dapl_ib_util.h index 96061b3..a710195 100755 --- a/dapl/openib_cma/dapl_ib_util.h +++ b/dapl/openib_cma/dapl_ib_util.h @@ -47,6 +47,14 @@ #define IB_MAX_AT_RETRY 3 /* CMA private data areas, use CMA max with known transport definitions */ +#ifndef RDMA_MAX_PRIVATE_DATA +#if defined(_WIN64) || defined(_WIN32) +#define RDMA_MAX_PRIVATE_DATA 64 +#else +#define RDMA_MAX_PRIVATE_DATA 256 +#endif +#endif + #define CMA_PDATA_HDR 36 #define IB_MAX_REQ_PDATA_SIZE DAPL_MIN((92-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA) #define IB_MAX_REP_PDATA_SIZE DAPL_MIN((196-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA) diff --git a/dapl/openib_cma/linux/openib_osd.h b/dapl/openib_cma/linux/openib_osd.h index c537df3..a67018b 100644 --- a/dapl/openib_cma/linux/openib_osd.h +++ b/dapl/openib_cma/linux/openib_osd.h @@ -2,7 +2,6 @@ #define OPENIB_OSD_H #include -#include #include #include