From patchwork Sat Mar 24 00:37:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890352 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="H5Wx8B89"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2B0Qh0z9s0y for ; Sat, 24 Mar 2018 11:37:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752319AbeCXAhv (ORCPT ); Fri, 23 Mar 2018 20:37:51 -0400 Received: from mail-cys01nam02on0068.outbound.protection.outlook.com ([104.47.37.68]:8096 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752266AbeCXAhp (ORCPT ); Fri, 23 Mar 2018 20:37:45 -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=Fvczh12GBxVajJhHy2/ZaALPcLrJn6lLxmK9z1OfrKA=; b=H5Wx8B89s9jrtCKhbtVC/3J0aNDk2zxmMJ7H35DoNWrqTfuKV4taKafhB/WO3fGwJSQ22gaMhoQXRqZPsYrPQ2tLOVGgau9P95+oTS91FW05SFuCzcqfxQbCA+1qVguAPizjHY4lXtVMEYTnBmYzz/moLeEs2xc5FeBPaPDSpos= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:44 +0000 Date: Fri, 23 Mar 2018 17:37:41 -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 12/13] liquidio: Renamed txqs_stop to stop_txqs Message-ID: <20180324003741.GA6597@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: CO2PR04CA0063.namprd04.prod.outlook.com (2603:10b6:102:1::31) To DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed9e7daf-f9a2-4a6f-45ce-08d5911f759e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:oLXmShyi61vH0a26NO/dr7xOSN+9CJISb07YViTuxkuGdN12bm/QOaBLsboDPaIVgqfABSAuPPVHYxFuGV0tSox9OgVejcIzFasx1ctvOEzscXvv2HVRU9mGF52VVRdqL4yz5uYXt7SHuBS355EQA4o2jNXCtiL+W8DgJPwh2MIx5BNjLV9vqnRfOPFgURtgI5v8+4K5SVjV6D8DXEIJu6Zy8lRX82dN63BKoFVDh4DzJztQ9/mBZUn31nWbfYpJ; 25:URi8Hjkb9PXXCcVZEhE5dEjJyjZKU3GD70HXFDM9mdNAckAJ8L2Vlms0Bm14X7TT0gLp0OxlI8xRGAz2MGpw4TS5nq6lixqQjGgyXDvaEn9tTG+n5XstHaCKHTzZGLnMO1iKycPUEwEYw4IPdpoAqqVuVQbGZ0LxcoFjo47pNS5TeSuJTWA1qbmiQb9agMEQbLVNkHRbsI+W81AShKRqKof4Ca+6C+wYEw+5vTWRH7dkxo3bPKBNvCDPJMsi2EKLjCVcru+Km3cpaMqr09/Uth7441ib6Ox3FvToZngrVShedAAslKIuDtifRWAs6yXjtdreSAj38pNPNvjccInDGQ==; 31:zVD3Ty2AnSqiWWM3lHFW9OTXx/61ibRThi/DufXaH5yyzAFggiPb4eEOWGgt4TXi/yiSqyaevT4jXDb/D6lHluR41eNXYjjjN+s2+F+FTHC8i+p0ALhY9j2TbhJh1H2M/mF5cl2oWtSKivIcvn1bhfhHIGY6nHmf1albJPtIThaKk57fr13NUwwY8yQeogLgVWo6dJbJuGBtPQD5jhbB+W7yc/SH9SJR5ZI4ofsUYRw= X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 20:k4c7/q5Dp7dhgCfJ3w8Bf1Jc8WnZjq0/pZm98lP6onCRQcdIe1NR0+eqZ/7waykVBg0KO2mXEoC4cMUWydFtKpteSXWE2X24tPfh2Vys+6oY7pI5WYEXZDYO/0IOausMaaKcveaTrxL+BmWz0gwLRpVqjqMsOYK4BPX0tK3/i0NGmHDufZ1AXbsuY39rKbNChgIIFHz+6VALuBz5snTtvXAOBvwCDMF+Yh6V3yQ1GphHJtmXTCgf1+tmwu4EuvDCgnU7OMJ09Gw938BjDVQjLyUBs6LLAJGGriLEvqWYLHXgHAiTgB21bZjFHhC6JSmSa1GYb7VY/oGKH1Rg0rxT6M6c9HKMf7C/p5ANUVNlu44S7q48T+aCFfjI7j2NpLb1qqQGaaYS1ct/Cr4htac1XUNPazz9ldUxGhYDyg8L/anD6JsnFgY5VOVzgZrVkJTQE3Y00gwwxLc7btMlTlQptvyEnuDjjyUEIFuMsGw6nk9v/6wsX7G9cxgRzzGkzNfh; 4:IiQRlbDl4uMi4BKAHZiybeWB6R2s52j0X0FUQiEVrxavJGK7BgQFlOmlI8d1pTsDyZfmQu+TXaz01JB1xBmNrLHzBo3pePrfgmF2NMQoJAoRQbQ16LABLQEBBqasWRS790quoI334MeNVpuw6mwvPuidcgPzM3ciHSPTOoCtCQe74mTHOwvheN9qcOwZswLLN1Y80o+smapx0cCZkzTFnGvmreotYmF13d300Se79TADLruTCHwuEpEZnm+OakM5rga1D4yN+tQObEtITVFXhQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(396003)(39380400002)(376002)(346002)(39850400004)(199004)(189003)(6496006)(446003)(66066001)(386003)(2906002)(1076002)(478600001)(47776003)(3846002)(52116002)(6116002)(23726003)(72206003)(59450400001)(50466002)(16586007)(6666003)(11346002)(316002)(956004)(97736004)(76176011)(58126008)(575784001)(86362001)(305945005)(8676002)(16526019)(5660300001)(2361001)(7736002)(8936002)(68736007)(186003)(6916009)(81156014)(2351001)(25786009)(76506005)(81166006)(26005)(107886003)(33656002)(6486002)(105586002)(4326008)(106356001)(53936002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; 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; DM6PR07MB4220; 23:aviARbVy30La9XsE6wW5CiDmSkj+eRWcwGeSgfC1JtBRqu2qTy0LCB+Oqgl6qNRz2h+3Bd0kDvJ35zkILroxYKqnuIbbG8rJ0xtvSYo3j0r2+aShwQM9nY+/JjJCRPpPEQFia3RuG64uTEmME0lWpeJWW38xqDnlTpruQm9iOU/yF04Yon08gC9jp6Ctcg8vyp45Geg2U1CCOC4Avj/jjstyufjlSrMPEWp/vVss1WHo79pMW/E64X/ZB5qFr+dxgNGEG0B529fx2/UQdt0elloW3NnornLL/wAuN65wYF52CMUc5kw4P3iV1IBfnZGfqJTwqWwaMzPW4+y8vwhHftLvsYSBFjv4Ksb9IJEL+HEJIrugHYommcCicvFASkVoJy7gCYu8jBP6p0fzllf71NPAj52Uu5q1W9d80TtL6kPZBoZFEnadUb9CQbcgBqJkkYogPrtXY3QfEZWCb3Dlhm1+UdwnYgmYzf24s7b+EgpNRIQbQdAL34ZGzjSlaKN93eFw1HywQ7/qMLn6xGx9PT6HytYWBOL7PaIN7GE7Qnk6Z2IEqyAFiYKyJ6VwzxAAkJPsmgjU5XkvdKE3tXBqZV7jY+KrmP613qr1/cH9oYkkrBapCbsLkFDOXKrNQGZYDZ+G1wkubKNUCgnDHrOaGV62/ZZZRzcbycay7Jht2+GMbQBd6IB7E7kn54FmiRDlJJLtj1hyrfKpEMoISKB9l7u40MJBImCcgAJQfsxpI5qx0ifD6N9MemnZQ/4V2e+uzYLqsFOXwuv6oNRzOZKcYF0p1hJc5QG8iMJc0NebnZR8sLNlLEhDnInnI9s7aiWmffD3IBhqeBu9Vq5+zfd0UO3JbesGXsy0GP/HRe80EK12Hw3BEqczq/ez9C3XVzBuaALBWW95Ov3uDAT+jYlk22TYtvwK9SHFsKSMzL4K1OOJFeHRakgIloAJQgg/no0K88kdXlMVAXBI/REW8oF+v0InGjudTCdO8iaAvFAvCQwndbEXogAYXZ14kDOpJUa4bc4VI7PkfcUHntiUUd+63hAi55dElf2asFKnCLOTaf74njSFj4bezDZP1kyDlWwy5Q+Zb75kt8zHgRampn0seyKeCn9dmI0LwoW3TD80mueb7wYiGKJEV90kxU1KYXtcOdg5MWF4Rpsr8nWFS7VKfO+bmwTNpdjY2eHrUMSmQrqtNdLAFNU0tBf5FTRp6GYciBODV2xFC7SjVDBr456Y2ItdA9tAXDToaUCRgcBwHNjuA73gklx0dnijvRHkinMo4yS+fnQV+38gh0/Mnmj87i92a0s6fAL9/xWoaZm0aZU= X-Microsoft-Antispam-Message-Info: w14qLn8poCtAiUcpuAStYhmbL+WWIENwsG+KnRURUqxQhTeQsL4XR67vENZddq1tI2Fg4pI+PJMecosrO7sqxsDPXCLH7TwgC8bn8M4nLcO6nxpFRWfiRyLw3c/Y2MPnprodebntALlIABITnsTmsjTlc4QYBEwMsf/q45PnjZXu8o4cJXzhyUZ5+44hxmpz X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:NubWpLTy2ck3QOCDnBXwKhHUsrOkyYr5nFmycJ0jxcUX4fErzgmYdM2FGdx3gJKQe0aY7caI/0p01faeRMOrsiT/oMnt5n5j1+9VlvhLmr7b8NCQeYm5Aecu5GmkjQxAdnvE7lyAsT3qVUQXXVlI2SthpUXGsGAwRmPAWlIRZyx7FkhY0dlP9MaZDq78waMwjnY/7GwbzMMMqhA7ZLpZwz5m1LTEZnpjURVvkZ1ooUEBGj2QUsdOaudnrzg2j4NBVNmNr9XV+0AsBc3EJDhyMpnZkEJzqabLpgxrW0JkNv1+ZMNdH+q/ET/hAc/ZsrMiWiHIzIiwF3e+umomdN9HD3IPXbeAevX49RHy164bJbX+qOr0sWsejLGyCRS3YoqJS/Nh5pVpSLoqy1Jmag04pgGYTEdbj23XvFYjNB/JzK01J4XsMLxycXEg/v5yZSRyN7+1zX61Qe8cl3mOTGfPOA==; 5:83JcPTzhG9hEIIeyWl38pNgDRXUsnds4YNlu/GemLeFcwT7D4ZW3HzzKSwcR+a6qkmPLZlNXYMd3pnZFIPxApDjTAPEzpmBIlsjKvcRR4RlLqHN2WXdPHTkncBHgaLVNqoFmk5i0zh87/KyrXLLQWQBX0emfKPobdKrPBM4yWvE=; 24:0W9CEsVVvXTwGmD9YIL6uHOkMM+5A4x6/H+i+Hu98CMdDv4Op9hztT4NcRcssUSD+UvTLJQRvGgO9QxrpJQauNcqDnBmdYgQV/MtURKPET4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 7:K7fwACOR1vN2n2W80KLyB5YOBwdjMkZ7/PhKEAtamjknOcSuMZXA2+U/Si4fRVzXToogqj1a05+YnUcjwwXi8Ic9NkLG6xf8dFXIaWOvkgE6819thZvB3ftoCtFTr+IOmqAU2g0aLLJCqlxGvgT3PNmWK//su0wx8+RfNJq5Y/yth2NtIP50F/28SVGaKhXwsLVgmDjIGqaF4HwurdsFAXJuc7chYqeGTTRZISdY9SwghOLMedjpdZPtYAKdWxtJ X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:44.4863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed9e7daf-f9a2-4a6f-45ce-08d5911f759e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4220 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha For consistency renaming txqs_stop to stop_txqs Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 8b0a080..54fd315 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -781,7 +781,7 @@ static inline void update_link_status(struct net_device *netdev, } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { netif_info(lio, probe, lio->netdev, "Max MTU changed from %d to %d\n", diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 288096b..4d7a0ae 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -518,7 +518,7 @@ static void update_link_status(struct net_device *netdev, wake_txqs(netdev); } else { netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { @@ -1186,7 +1186,7 @@ static int liquidio_stop(struct net_device *netdev) ifstate_reset(lio, LIO_IFSTATE_RUNNING); - txqs_stop(netdev); + stop_txqs(netdev); dev_info(&oct->pci_dev->dev, "%s interface is stopped\n", netdev->name); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 3cbc65a..1b4c85a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -510,7 +510,7 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) * \brief Stop Tx queues * @param netdev network device */ -static inline void txqs_stop(struct net_device *netdev) +static inline void stop_txqs(struct net_device *netdev) { int i;