From patchwork Sat Mar 24 00:37:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890350 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="PObBgUPC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1w5dq2z9s0y for ; Sat, 24 Mar 2018 11:37:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbeCXAhi (ORCPT ); Fri, 23 Mar 2018 20:37:38 -0400 Received: from mail-bn3nam01on0063.outbound.protection.outlook.com ([104.47.33.63]:36154 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752192AbeCXAhf (ORCPT ); Fri, 23 Mar 2018 20:37:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uLNBC79Qma7Gypdu9sz0Ugpu2/Zt+TIVFKxqyxQ45Wg=; b=PObBgUPCAVgMbIgLm1KCDMMGQBaXwF+ARztv4WwfUhYMmB4loOmwsJqflp7DaAkDGAYvRH3NfU7fMy+k6h2yviBAdKC6UiHI0+msKOtyNe5dbJ0sHR3YLa+hFKRqamgSsomt3eA+GFv3ikhYo62CebD8dox9HyQQJZ6Az18Iduk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by SN6PR07MB4221.namprd07.prod.outlook.com (2603:10b6:805:62::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Sat, 24 Mar 2018 00:37:33 +0000 Date: Fri, 23 Mar 2018 17:37:30 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 08/13] liquidio: Removed one line function stop_q Message-ID: <20180324003730.GA6553@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0108.namprd15.prod.outlook.com (2603:10b6:101:21::28) To SN6PR07MB4221.namprd07.prod.outlook.com (2603:10b6:805:62::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 272f25a3-380c-4fb4-2c5e-08d5911f6eeb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN6PR07MB4221; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 3:/rKvG9myNONRbZzDDlYzrC/e8q285bxBfSsvVat4r5m7wppX8dqIubbC2nMxzbHFUJeVW62yvUs0+xU+2y8x46klYL/3Li+ETz4WIfw+0w/9oYjZQoWhAeBgCcJ9IZcPT+GLaBUGp7P/g4kkZ8Bm+fEyVJ4VGoWlegm6rJ8wZePxlZE19dj2G3AMGmJKNAaqremBLdXifiPJlO8ddlVFuw5JJQaHCK/dYAf6MjPNM2bcBY8BdeKNdhxoTty8VNDV; 25:+HyrS45pRvHDtuCyN/L23rU76Brgd27OYkcQ+gIZOStSRURYv3+cQWaZC0oleqTztzAjl+AXxcLyTuSA+qy+Co85T+kWatGPpgSX0ilC4po8TWWHmt/W8QN8Kwwfj89FQLfKFYC36A0yFHus/xvF/EfTb+UVpSr1aHOwPc9rgtXfks4oYcSnVznoyPr0wwlPQCod6HIyBMmeZQLLuV0HYTJZJPfyiE1OIb+iXRrdVoiKEk+wa5K7VAxzltOl7ol3bgsWzywpzpzuqp31xQkPEBIyJwDD17ueOAJpcv+8KHjNiJAwT13pCfNjd/v6ytrQ0zxZXXmE2DF5wPUPqULEPg==; 31:HIfaBvN/j/qXjoPKUUryQcRSAwCCFM39J4BdQ3POWzIxrxYuaNYAfbk3wft+MmN2ePwGKtw+SOITJQzVBUTM1xeAbyFEYSt1RvHLcfkDQo6tS0zM9LF99Hk+ZzsYyfE6OT+u6VCG8QeGJF2NE7O9FTzArJ6tVxAxwkNL5MxOqbZ5eLxqtRbIsRCZwF2aOT1HYScrK1jrOEJihy5nif96G8Rg4B6IsZimcuP8ulpkQKw= X-MS-TrafficTypeDiagnostic: SN6PR07MB4221: X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 20:mELvEcaAmWzT2tOeonm62Mn8u0m54Xf1Dnt8Ro+0wg4jX8DuM07LqDmRAfHGoSWzdm8udNS7egUZxlNfoOPHpKcNxWB9d07F9tUbOHtW2Ie4UwDF9FNRT6rBu1e5omXh41qEQo1ren2TcTlwQt4LGIlKZlg29FfNTAhBbppojUjjsaGB0lo3iz5YUr8FLLHxj+4WgV1XG2Jt0tf55iuTFDr84x/EI6CTDrNqNLkL7IKfOumyt1OZarczGna4neTygXCZv644SyWtexVJzhu4C0nBPS/t0XWUs6ozhkJHORaZyt1S61tFOQJ37RSHz3rZBCcQpDw3ntLIpz4JsnviIz65bbQWHL7UZNBmd28TiJZzu5mPa5tnAF7GHwkxZ/SBHZ0Ox1rQL1v5CzCQUKdxZhogFtsMKU9Q2FhZ57uqP6jCdCHeeb8Kdx1SQ7Dzu0UUS+GL18KroN9qZKjRYBoGxFxDr0o8Naeq+2/pLaWdFPGPxcNSA/tLTsHKdZ53rgdg; 4:0FOalCOoOKcZbtP5K9SKi6LmTfhvalspduSElmuqKzZoKf58jGrsDA2uuhRE2QgIG/rtvNo/uDZjQEYq3IPWKpk1QFyNmPHJpHF87/SjN2w8+79VzZzWD7x48lIVFHjkKZCTUv1wJpPd+rzqihKVpX3w0ix7Ljpg5kXimClfckky4CuynvS9vb3z0anXVNonT9XOfqk1fZwXUCHJNlEhED40/VNDGsNFp4FibG8P1JmfcEUdsbLtQUAkSMTJAkbIcOCus5LlJ5Y9UAxfoqj5qQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:SN6PR07MB4221; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4221; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(346002)(376002)(366004)(39380400002)(396003)(199004)(189003)(59450400001)(316002)(11346002)(446003)(186003)(47776003)(6916009)(16586007)(16526019)(305945005)(7736002)(58126008)(66066001)(33656002)(2906002)(4326008)(386003)(25786009)(956004)(53936002)(1076002)(5660300001)(107886003)(76176011)(72206003)(76506005)(106356001)(52116002)(97736004)(50466002)(2361001)(2351001)(6486002)(86362001)(8676002)(81166006)(81156014)(26005)(6116002)(3846002)(105586002)(68736007)(8936002)(6496006)(478600001)(23726003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4221; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 23:WOJWcPEjMTBwEMqNKlHeaJHBiK1AGOe6cyMUm0i0bmtwYuNLe4/9XsCepbQ/oUa6HpumEuNRCr1keQiQ1Ax7dbkXDYqVDkdod41RIUvJ1DHytu0p612UWQE2QAVPAusO/4JbxZAD5/Z/2d+I6hDaubg2ZPIZ6nP2ZPoJ+2RBYCGJr/OduI1irbrj6aZOzJQvKVdkh9wuTdFw5L9f3ijEuZQc+hD0k0goAJsv3esr7MKyRSMp1l1De+L94v2h3yomItpPOLAnIHoj3a4cRo5+aD/DGT9CBI6jXdaoWxgZ0BWOaHyl/HuKXJz9A+rx1MPq4aEGP8IMX/SN5JI5MhO47PwDShVj02LhF+LM84Y4RuNVDs7IQZAepHcKn43UFirBwcqwXsCq7Q/EpTSj2Aq1+/YgJjYYUgj0ymwr25+EGx1WSAdsq7exHloYpv6M5WPjm9B7Lq6KmJ+nyXoYlwQUyf8zfBRUR2A5FJEiCG7Z1M+DJtUE4211RnsC8A7D8aXyBNuIjAvzP+jygBmdCDQC6kgM5XK8c/EVhtAFq3x8DXUzutdaiTYyb6pzuMuMnBSMlXxoD0Kkq3lTaldjj1hZdPifY3ycbb+Csdmw3tpq2qiSho74bNVpRy/rVSSawg71BuXbIFAmx04Pb8vtI+7tTSeEaqZWeDjU7Zcp0ZEJhCCzkEAIeZw6gc+xCJgm7QnVDl8D/UQ6DrOrHLtFcTP4lreDUuF3iyKLd760zOuEHR5iecAK/OVyGEWs2O6xjTEFL3pf2Nb3nMmGso998LMK24bniSVGQ+J5nV6bRUzrXLtWjbD9Jp0Yw2J2hdAPdtUUFEeWSiuKAYVxd/4K+KwBOj/XntLROeo9n98YQe4nA0mdxzbtHam76vBR6SbrrL8vPYXi21kFvTi1BxwGdlzL9AT2WVDF5Q/gJNK6KsNmgZu1A87GE+ZMwQ05HJZrxCMQKXBEtFghMGMo9sGRlWve0PYD0nOlkcGfPYQjEqmNr8r/BaWK1X3Fl0PhfxrYUju9o5bujXc52mISqOqyEVILpmdUKp3D9aVHzK253Lg4E+cRn2qgvhs489J3/3Yt6eoiBL8Wx1HGkNu+iC76C9x9yzjPzaglwYu7Go2z20OaCHBrscrXbJII80MVwtWtOw7ueAlDqBrYN4J0IeZZOMlRTCCRkwUOXPq8JhmY7DtNkqE8VO4Yix7mtUELTLdIgzpXsfi/MuZa2oJ/qSWHENZKWPa2wG0iRWfckSV2SrfXd8FbRY2Aro4aQ7n3VAowXiOn X-Microsoft-Antispam-Message-Info: xjKg5oB8xJ82p1a67ddXDkxmI9ImTZ84/gHSp8B4A0JtcdZgeG2NKWn1Fkub9Z6D69NjrJLrpAP1jCEcsPb1/9DV2eCl2sDaIRkG2g1/jmuLWLcijoEdQEUxgeYNMY1fYlj8V+bb0dEo3Wq7jQDHbLLrqwwflhX9uX+nguUoLI38qqS0YF46vYmyrVMH0Ato X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4221; 6:Gema8raqmBHt/GKqCq2vTdq1Id1IdaSLc5uwXKh03QtXXF09NlgNDBKZPz4mBP5Wsm+rldful9sELGwmbxi5BwZQB/lHjvpMaaz0iJqwOmRPQnHDPtYdp+MC0gwoOLZyH4ZaTUbSnDwcxTINzQw4EreJ8FXEESu0dO1lGkNVOIEDs5ua6KyddFNRWJQKP9uA4CXe8xwoiMZYNozU0PD1PoPjncNcyF7F8Q+Y1bWCSW9EknlSL5DDqbZ5ZKDw8mnpvK32ZVus994SdClPtiWstTwa3zwCYHh8R7R+xRG4ytXiG+zs81qVFHv4j6DSdWdFu4RZL7NMaSGr69z+d4CqTSkoFTEt0+UVT/Cu8Z6Y39A=; 5:flTgWn30BynlO2zLJzquuD13cOEeWGMg6MnWjoYpYjf6CY0VBUoxs4OKYlR3xsWYVEjKkPe4FKukBhHhCFaSn8uW0lcAuK40YloWgkztHXai/h/ANDq9W1NQUYsowfH7P4uPlj5sCd86dhEhkofcYp5me9rAWMxNaECXQ5hXids=; 24:lwrdLyH3Dyv5MJY3Y9hmjQ0nNX1K1eF/NBn5FwRJX0gHPFDoHxDIQ5dSBLgOCCeEZ5ikRkFxKk5yDc1WLpMSmSdNiPrbTn/NXKhSCo7visg=; 7:dEv7O9/HDpCJ0luEqi0QWxWPVLHW1bGas1MXzgb+TY8wb8t6KF92CI5lSArZk0EwvSM3ibJGOAZPCL6W50ySPtIZFL/rW/N9JM05mADm6vQyvAM5Em3SEHTYVZaW1BS/sSNBDRK5Pp4WPsi1gWs4n+GwYRqrYk73pjpYWveb6R+vGaj9VCq4R0IpGfH+ihyQ3dF1L7dwJL8ARQPosCQaexqpn079nudGwyPY5wiMoDe4BnBFTwNLntbkFoDCFYG2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:33.1994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 272f25a3-380c-4fb4-2c5e-08d5911f6eeb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4221 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing one line function stop_q Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 12 +----------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 5ef9aa0..be16a1c 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -519,16 +519,6 @@ static inline void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static inline void stop_q(struct net_device *netdev, int q) -{ - netif_stop_subqueue(netdev, q); -} - -/** * \brief Check Tx queue status, and take appropriate action * @param lio per-network private data * @returns 0 if full, number of queues woken up otherwise @@ -2745,7 +2735,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) netif_info(lio, tx_queued, lio->netdev, "Transmit queued successfully\n"); if (status == IQ_SEND_STOP) - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); netif_trans_update(netdev); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index f46289d..3120aed 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -295,16 +295,6 @@ static void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static void stop_q(struct net_device *netdev, int q) -{ - netif_stop_subqueue(netdev, q); -} - -/** * Remove the node at the head of the list. The list would be empty at * the end of this call if there are no more nodes in the list. */ @@ -1803,7 +1793,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) if (status == IQ_SEND_STOP) { dev_err(&oct->pci_dev->dev, "Rcvd IQ_SEND_STOP signal; stopping IQ-%d\n", iq_no); - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); } netif_trans_update(netdev);