From patchwork Wed Jul 2 06:11:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 4463651 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F1C6BEEAA for ; Wed, 2 Jul 2014 06:12:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBAB920225 for ; Wed, 2 Jul 2014 06:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C67C2021A for ; Wed, 2 Jul 2014 06:12:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752662AbaGBGMJ (ORCPT ); Wed, 2 Jul 2014 02:12:09 -0400 Received: from mga01.intel.com ([192.55.52.88]:11001 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751998AbaGBGMD (ORCPT ); Wed, 2 Jul 2014 02:12:03 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 01 Jul 2014 23:11:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,586,1400050800"; d="scan'208";a="563985265" Received: from cst-linux.jf.intel.com ([10.23.221.72]) by fmsmga002.fm.intel.com with ESMTP; 01 Jul 2014 23:11:46 -0700 From: sean.hefty@intel.com To: linux-rdma@vger.kernel.org Cc: Sean Hefty Subject: [PATCH 7/8] rdmacm: Update addrinfo with XRC support Date: Tue, 1 Jul 2014 23:11:18 -0700 Message-Id: <1404281479-6755-8-git-send-email-sean.hefty@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1404281479-6755-1-git-send-email-sean.hefty@intel.com> References: <1404281479-6755-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Remove internal defines, and use libibverbs exported values instead. Signed-off-by: Sean Hefty --- src/addrinfo.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/addrinfo.c b/src/addrinfo.c index 68eaddd..cdeb663 100644 --- a/src/addrinfo.c +++ b/src/addrinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Intel Corporation. All rights reserved. + * Copyright (c) 2010-2014 Intel Corporation. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -45,14 +45,6 @@ #include #include -#ifdef IBV_XRC_OPS -#define RDMA_QPT_XRC_SEND IBV_QPT_XRC_SEND -#define RDMA_QPT_XRC_RECV IBV_QPT_XRC_RECV -#else -#define RDMA_QPT_XRC_SEND 9 -#define RDMA_QPT_XRC_RECV 10 -#endif - struct rdma_addrinfo nohints; static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai) @@ -68,8 +60,8 @@ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai) switch (rai->ai_qp_type) { case IBV_QPT_RC: case IBV_QPT_UC: - case RDMA_QPT_XRC_SEND: - case RDMA_QPT_XRC_RECV: + case IBV_QPT_XRC_SEND: + case IBV_QPT_XRC_RECV: ai->ai_socktype = SOCK_STREAM; break; case IBV_QPT_UD: