From patchwork Thu Jul 18 19:52:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 2829798 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 399F19FA38 for ; Thu, 18 Jul 2013 19:53:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A960201B6 for ; Thu, 18 Jul 2013 19:53:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80B90201D7 for ; Thu, 18 Jul 2013 19:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759441Ab3GRTwv (ORCPT ); Thu, 18 Jul 2013 15:52:51 -0400 Received: from mga09.intel.com ([134.134.136.24]:52363 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759247Ab3GRTwt (ORCPT ); Thu, 18 Jul 2013 15:52:49 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 18 Jul 2013 12:50:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,696,1367996400"; d="scan'208";a="372729279" Received: from cst-linux.jf.intel.com ([10.23.221.72]) by orsmga002.jf.intel.com with ESMTP; 18 Jul 2013 12:52:39 -0700 From: sean.hefty@intel.com To: linux-rdma@vger.kernel.org Cc: Sean Hefty Subject: [PATCH librdmacm 3/3] init: Remove USE_IB_ACM configuration option Date: Thu, 18 Jul 2013 12:52:13 -0700 Message-Id: <1374177133-802-3-git-send-email-sean.hefty@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1374177133-802-1-git-send-email-sean.hefty@intel.com> References: <1374177133-802-1-git-send-email-sean.hefty@intel.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Hefty When the librdmacm is configured, it sets the USE_IB_ACM option if infininband/acm.h is found. We can remove this option with very little overhead, which would allow a user to install ACM after installing the librdmacm, and the librdmacm would be able to make use of ACM. Signed-off-by: Sean Hefty --- configure.ac | 3 --- src/acm.c | 3 --- src/cma.h | 6 ------ 3 files changed, 0 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index b4303c6..59c5eb1 100644 --- a/configure.ac +++ b/configure.ac @@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [], fi fi -AC_CHECK_HEADER(infiniband/acm.h, - AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), []) - dnl Checks close on exec support AC_CHECK_HEADERS([fcntl.h sys/socket.h]) diff --git a/src/acm.c b/src/acm.c index 09c5d4e..04cddee 100644 --- a/src/acm.c +++ b/src/acm.c @@ -45,7 +45,6 @@ #include #include -#ifdef USE_IB_ACM #define ACM_VERSION 1 #define ACM_OP_RESOLVE 0x01 @@ -453,5 +452,3 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) if (af_ib_support && !(hints->ai_flags & RAI_ROUTEONLY) && (*rai)->ai_route_len) ucma_resolve_af_ib(rai); } - -#endif /* USE_IB_ACM */ diff --git a/src/cma.h b/src/cma.h index b575b9b..e6fba8b 100644 --- a/src/cma.h +++ b/src/cma.h @@ -162,15 +162,9 @@ extern int af_ib_support; #define RAI_ROUTEONLY 0x01000000 -#ifdef USE_IB_ACM void ucma_ib_init(); void ucma_ib_cleanup(); void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints); -#else -#define ucma_ib_init() -#define ucma_ib_cleanup() -#define ucma_ib_resolve(x, y) -#endif /* Define path record definition if using older version of libibverbs */ #ifdef DEFINE_PATH_RECORD