From patchwork Wed Apr 30 19:31:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 4095961 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 10652BFF02 for ; Wed, 30 Apr 2014 19:32:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32F8520304 for ; Wed, 30 Apr 2014 19:32:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 531A420131 for ; Wed, 30 Apr 2014 19:31:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945966AbaD3Tb6 (ORCPT ); Wed, 30 Apr 2014 15:31:58 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:54371 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945938AbaD3Tb5 (ORCPT ); Wed, 30 Apr 2014 15:31:57 -0400 Received: by mail-ie0-f180.google.com with SMTP id as1so2427239iec.25 for ; Wed, 30 Apr 2014 12:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=yVlOQ+3LBG/OJ7X3HjpGMmDMDG3JJSF/ZeWljbFxAgw=; b=BZRYSxgMA4zheDI7s0LchgovExxgG26UzM0/bEH+ndq5XOfquozsCHuHHUu2OVw/rf p0V2gK8IL0+1EfzTYyP+PZyFXwwSOPutNagoA2CwvYcyk7GHuIcTzoA5ny8OeJn0rKgH hEXq1FBP+mAIFd5rfd/f/8RquU7LLCIx7JqES6hb6OwAjRI6SuORsYtTGyV5utzOuBkj iIohTzRAvlNuIuhaumEP5W34cCJk4F1LOVNjQQJJ9osNoPnlPNFiYLFETXVVZByVn3CB k2aXl1DNcGd1Ds0UTTruflgHeDgKk+UuGUq77Tb1LSIoTLFzUwFC6cXW1KXOWwudN4aU odAw== X-Received: by 10.50.72.50 with SMTP id a18mr40520031igv.35.1398886317080; Wed, 30 Apr 2014 12:31:57 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id g1sm8538016igt.14.2014.04.30.12.31.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 12:31:56 -0700 (PDT) From: Chuck Lever Subject: [PATCH V3 17/17] xprtrdma: Remove Tavor MTU setting To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Cc: Anna.Schumaker@netapp.com Date: Wed, 30 Apr 2014 15:31:55 -0400 Message-ID: <20140430193155.5663.86148.stgit@manet.1015granger.net> In-Reply-To: <20140430191433.5663.16217.stgit@manet.1015granger.net> References: <20140430191433.5663.16217.stgit@manet.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Clean up. Remove HCA-specific clutter in xprtrdma, which is supposed to be device-independent. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 54edf2a..515dfc1 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -48,7 +48,6 @@ */ #include -#include /* for Tavor hack below */ #include #include @@ -920,19 +919,6 @@ retry: } } -/* XXX Tavor device performs badly with 2K MTU! */ -if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { - struct pci_dev *pcid = to_pci_dev(ia->ri_id->device->dma_device); - if (pcid->device == PCI_DEVICE_ID_MELLANOX_TAVOR && - (pcid->vendor == PCI_VENDOR_ID_MELLANOX || - pcid->vendor == PCI_VENDOR_ID_TOPSPIN)) { - struct ib_qp_attr attr = { - .path_mtu = IB_MTU_1024 - }; - rc = ib_modify_qp(ia->ri_id->qp, &attr, IB_QP_PATH_MTU); - } -} - ep->rep_connected = 0; rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma);