From patchwork Fri Dec 20 20:38:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Upinder Malhi (umalhi)" X-Patchwork-Id: 3391891 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 7B01D9F314 for ; Fri, 20 Dec 2013 20:39:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9B6D206FE for ; Fri, 20 Dec 2013 20:39:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4743206F3 for ; Fri, 20 Dec 2013 20:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752214Ab3LTUjQ (ORCPT ); Fri, 20 Dec 2013 15:39:16 -0500 Received: from mtv-iport-4.cisco.com ([173.36.130.15]:59425 "EHLO mtv-iport-4.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932Ab3LTUjM (ORCPT ); Fri, 20 Dec 2013 15:39:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1494; q=dns/txt; s=iport; t=1387571952; x=1388781552; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=1W5Ck6igMu7wU2F0EN1SxY5n7GC7doiZndXVvXanBvE=; b=bSRFAvxEJqeFVpeRLzqhas2q00+WjXbnEeWf23IHI81Mn7VRJeQGP09H tjuGVC18c3yxhh2QH15mJUQt01DuuRG3TCfy0AbwDGN3A3iucfxgnl6Fr yb6Bx7W6QmUEDOfVmGgN4aqqRWe4uT0He1ypy/qbVItJpdviFxdNPbI2g U=; X-IronPort-AV: E=Sophos;i="4.95,523,1384300800"; d="scan'208";a="101057872" Received: from mtv-core-1.cisco.com ([171.68.58.6]) by mtv-iport-4.cisco.com with ESMTP; 20 Dec 2013 20:39:11 +0000 Received: from sjc-savbu-bld03.cisco.com (sjc-savbu-bld03.cisco.com [171.71.188.58]) by mtv-core-1.cisco.com (8.14.5/8.14.5) with ESMTP id rBKKdAwA001091; Fri, 20 Dec 2013 20:39:11 GMT Received: by sjc-savbu-bld03.cisco.com (Postfix, from userid 246720) id E6D353F80B; Fri, 20 Dec 2013 12:39:10 -0800 (PST) From: Upinder Malhi To: linux-rdma@vger.kernel.org, roland@kernel.org Cc: Upinder Malhi Subject: [PATCH for-next 6/6] IB/core: Rename RMDA_TRANSPORT_USNIC Date: Fri, 20 Dec 2013 12:38:23 -0800 Message-Id: <1387571903-9398-7-git-send-email-umalhi@cisco.com> X-Mailer: git-send-email 1.8.0-rc0 In-Reply-To: <1387571903-9398-1-git-send-email-umalhi@cisco.com> References: <1387571903-9398-1-git-send-email-umalhi@cisco.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=-15.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL 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 This patch renames RDMA_TRANSPORT_USNIC to RDMA_TRANSPORT_USNIC_UDP. usNIC traffic will go over UDP, hence _UDP suffix is apt. Signed-off-by: Upinder Malhi --- drivers/infiniband/core/verbs.c | 4 ++-- include/rdma/ib_verbs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index d4f6ddf..1428adc 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -115,7 +115,7 @@ rdma_node_get_transport(enum rdma_node_type node_type) case RDMA_NODE_RNIC: return RDMA_TRANSPORT_IWARP; case RDMA_NODE_USNIC: - return RDMA_TRANSPORT_USNIC; + return RDMA_TRANSPORT_USNIC_UDP; default: BUG(); return 0; @@ -132,7 +132,7 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_ case RDMA_TRANSPORT_IB: return IB_LINK_LAYER_INFINIBAND; case RDMA_TRANSPORT_IWARP: - case RDMA_TRANSPORT_USNIC: + case RDMA_TRANSPORT_USNIC_UDP: return IB_LINK_LAYER_ETHERNET; default: return IB_LINK_LAYER_UNSPECIFIED; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 979874c..485a8e0 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -74,7 +74,7 @@ enum rdma_node_type { enum rdma_transport_type { RDMA_TRANSPORT_IB, RDMA_TRANSPORT_IWARP, - RDMA_TRANSPORT_USNIC + RDMA_TRANSPORT_USNIC_UDP }; enum rdma_transport_type