From patchwork Sat Mar 24 00:37:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890353 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="Pdv2kORi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2C2HZyz9s0y for ; Sat, 24 Mar 2018 11:37:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbeCXAhw (ORCPT ); Fri, 23 Mar 2018 20:37:52 -0400 Received: from mail-bn3nam01on0058.outbound.protection.outlook.com ([104.47.33.58]:60333 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752192AbeCXAhm (ORCPT ); Fri, 23 Mar 2018 20:37:42 -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=5Rixr3iRLir0kUoYEWYuSWFkMF+KxyhBzkiMBiq2+WY=; b=Pdv2kORiVrH/yqnFPEMFYfS8A/jZhNZmVoB78dXd1QisoK+E6ta7T/AYLLIb91fN9dZ0fvCrU+sMdPgkTVPVpSWZA1Y+XS8U5SPRDi4a50DWDWyGvb82uQr1nRHZLODWcmLADosFShwZ5MUZpYx6H9vnP1ZREWwmBQKjQ5wwGdg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) 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:41 +0000 Date: Fri, 23 Mar 2018 17:37:39 -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 11/13] liquidio: Renamed txqs_wake to wake_txqs Message-ID: <20180324003739.GA6586@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: BYAPR03CA0014.namprd03.prod.outlook.com (2603:10b6:a02:a8::27) To DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65b38b42-988b-4c70-5511-08d5911f73a8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 3:bZr7NQYkUb81iZuZntzjRNBqtSmubQhS2sMOVAx53gCslkWb6VT84LI/uwrZruW68jkCKjwZoSUMs9XQ/l3TGksx9MhbuWHYHuY5/3/1/VhQIo0x3crEAiETgEY3FnTUzB9jpiemKYwHHWpmwGc8dQS8FMaNZe0n6FKPfdUxXjsfB0b0m9yyMjnBvyiy5bTv8qNz3JoYIX8LaHFvs5Ax/SoSsx5xekVlaTAuiIRTIXubsbESi0qmuYE9T5GXuqML; 25:55s+iA6EKYERx46LuH3Ae2FxLGUQyDxBlE8dxVX5MJ/HI262+Gv9TNFUBTwBaVITzdXFbD8ECW5SYjYHeITBoftpdZqx0S19q8ue9OyM5xtBm/QGZMdaFkb/KB5hhiTyeuGwVnWPuznwOVc23khEk+gvOr7kA0ivcHdeDeR/1D+tYd5m4m1Iix5MOKMKoQABnA8Hjp0Ed+HOkgdTGidVD5/+rQeJFVVGk+A+EN1DOjID7ZNlHGlF/4i+YQWnOoQCYJ/Cy2Gv5HKhseoocsmd0BH7UnmccmaWadjGG+/CrMzMUvF1PbItsXJt1KgQG+Ri8Htu0Hc1i4Pq8482oIXvQA==; 31:+Ugqxbe7+O231Gx22dgVgxFe0cCtnE6AqGGka6DpRRhhpFGVLuZTeL26KOCkMBQwiiEv9iVk84xdHOGN2X8dN338rhynbHP7A0QcKnZFP6NU2el6oatxvCeS35HZZ2S5efZPcYnuECZMRWelxIOf62hYy1KojYUDw2VQbaSG8jxs6AfYr4gM2viWUdsTAIXh/S7Is/eZNqeY56w+7FGyjuy5tyte4CM4o2YMzZcPZfM= X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 20:dpuvKj7K1z2ezDSNDBr5IdtBeSDuaDdmZ2DLVG8p/QWRTcFGjF++xepNU9qfydiB9qwjtNpDJPF61BcqYQ7rvQvcOmFd+P1QZUUmh3wP9S+9lRx6GDAtmItufimwISYo/OzseFYy6o43LBb5xEZowGWMSrIK1aSN20MaNBv8cmrNT8RK0I791IlUC+H/1HagpiaJ5dmg0M28MtIIg3X3BEhQKtWF7tDvmNgpOsRWxLia+yq1JOaQCFKdk595+/4U2BHUZGMBS7y+duflB8BWW8oYmKTIWvNdm5og8KRnfO5PDQ+iwuZy12QccnJm/iOdKZTYO29XqEZxeuYXsBxCB3cyYJrVbFsdmXobsxBZhW6iItelZMGmq3ufn9TApb3MWZQzDMAi8WrPliytiesCJkNEPSTYCsw2jdky1jz/cw+6JsbxJo1uOz4qZ+F1pR/XybO2mEZOu56XRWKvhSR0ekNlsQlap7towUJaWWM2PNOwVIcVAJc9BWqRCWAMdISz; 4:+8ge/SuQI7qXV1FcacB/BIJGIxY2J50pJWUGEVEFu67n7wf1+OdYo1vJ58xT4vVQl7dt1W7kWE8PZ9VlXDBmPbyk6F7aFpUSBx5ZaYvZm9GV0uKGKOjKDzo1sndxNw87BTco0d/JDfDGMY+6HOt49aaL9//TS84kNZN1QAYXRB6iOQnT7rpTB2lD7UfReq17yMavw1UfQSULovTvyK9aveDGgpUXL6J1qEG5u3sUUr6gNf89ZFzjSSLsoX9OhxfFU/MbTXv8hLKyui/g8EW1tg== 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)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4217; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4217; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(81156014)(81166006)(25786009)(106356001)(6916009)(2361001)(386003)(2351001)(33656002)(76506005)(105586002)(7736002)(5660300001)(956004)(8676002)(2906002)(305945005)(186003)(4326008)(52116002)(53936002)(6496006)(446003)(11346002)(575784001)(16526019)(107886003)(68736007)(86362001)(478600001)(316002)(26005)(72206003)(47776003)(59450400001)(50466002)(3846002)(1076002)(6486002)(76176011)(6116002)(23726003)(16586007)(8936002)(66066001)(58126008)(97736004)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4217; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 23:4yh4v6QwKilJPMWQzjot6FoXt/Yu3ay7AG29j7wIRq/RrpyJhsWWgTBM2URFrdjw1CWWDGi72Zpc9ttd6qEG/74ROeQpaFJMZAh/hqNNU94pTc95WiGX8lvCSO484/Sib0T0sPd7ZZTRNAlMo2AUpeck/i/hqh/gsb4PhnaoU7LQEkNdAeCUqomKvEwP3JFKgQDz0aB5z+O7yDut6Cn4MA7FNA9kG/KEkWF5yafGP27/HjThsm2Lnti5aDsPtyJCdYg7K5cdjDuBcJmp4VuPmAnDsQZIOSxf2NFyNsXRXdb9PrSXXST0aCcjYa/o0DCATe3tbYR4bRJa9Vm3j1HJdZSW2rdd05uEGpoz7UaseBMdryTkW4R4EipzWjwEVuaBRUWB8f+4IlgAjA/cdO8C5J9pKXO6wDIN9zxw/Mh3qAX48MMZDkBqnR3CO9kVJGQ7qKT8UYQGdQPwkrFbYSZCsN4VK3OW8Kedrjmb0/QObJ9/TvfkyRs6aTVqwuGaleTXlLqxVO7kTcyaegOzyFFu6I4yW6lRzcsbgfNd8Tb3fZx05/aR5XUc4cGx4wVFZj13tyFzaWfL5lYo3/XCA49rqbtYBTqvUGB9zoekp2ITlKNr3gEl08P0LsyIidJGiqtRBsIGBennkP6tCwI+Tc+JxxlmGsIlrEPzbk637nITpIoLoBcM4Rtlkl2rJooEt+AqABqntRxbZCYc8EIEt3hCR/p+O20/RjWhvDN/U/L6+YEy+kEjG7YRE49SizZZRjYTkJm/YtV9n91MI3kTx3OK6z3BFvbjdAwHFf4HQPI1YXD6U4gP+fwZL33wgsWf8iZy0XTHhgXU5PSr11IuSH7mLaaD/SDAnHbBEZzHWKsf7wR+Ho7WvQovWZq4GglW3kenvwPt+5tvQR7CBoCniKybWDea8tR1D2vvL4MckvK3s/JglbHtBy7dNtBksAaLMVj8Kk6RLKdNUGabeGH1Z3wLOhrOlcHycpXOhD89S6uuvVfK/LRFCbFWLjL+CEUIsZ6C+WBy5cfXVdBlwk3CkLn9WPrDabB4Qql6egglv4WsI+Ay6ma3M5XM3wLn/mQeFjpBcf76JQXoc3z2u6gRcSEEQ85lwC4senSCkH/ec/Gw6a+VDBvaT0rnVIK4h04YsvXAjezHmxtydqHqrt4SsuIlqRc7RzYiKJP7teiQfdW1REQc2xknFWKzTxBaMz0LXZw/rusx8niFHl2Milo/RK9LY8G4yUZKLYe+7WHOCz3ck9s7jBSfNQcWMOESmhYrrU07JZBRpXlxunD15OXL8+plmA== X-Microsoft-Antispam-Message-Info: +UhmhI5u8gmYJRBmQ8TgWqbtnKs4ynUwmsqHWY32TMmkV05MUUY3KqmCIQJVHYrrPOVpOIPZqbWZdN/smyWj56Lgx7M4NPrg0jBlqrP7wCWOketbh/M3oEOO+SLcR1COFmN0Pq6aVHmtjQszc+vw/c8VfoQdEwu6BB98wZYXvqwuSLy28mbtcJVd/XbvEkQY X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:mX0HcvQtpwyMzzOh6XsNEHYx+KsCg3SQoc59A+/qWp0XNOwJAJUTN1m9Hc8R+4klb4dOBGLtoH3c4Ap+P1//UlZuVxhKB6GrvaDOq3hiBd//mNS8loco0C9EMOv08DzpQhfgRH5TQjhg0zAEfvJKKQsAVdzxXC50NndxwIbFIEYeLocVApeUVLyW7XjkUINMgYK8ygoR2jsaisMwq9zpTicROjvhKB36r+7mWmHUzjt+EEUlH1xxNfdJNXK6iq521a8D/evI5x7WBoYQWuwCH9djr4zh8aVpYSTaIHSNR0RlRUbLSpftuMlHmg1RJ94atrlMyya1TeySv3q/HV+T902S2u4/2bvGAXddQndjjvByjeTbwBNU1kIMzDA85Wy15ppH44m5qmtELZi5Lf3rYEWiB8AyQiKfu7f4mBFIZrn49aPW4k0WJy8yf9Vx48sR3onesnIPXEqsFEHdjXKNvg==; 5:Pi0yS1pphrQ5VS6YJuGjadb30V8Uf2f1Z4vYKmYtxwnchtxwKmAt2PY9BDHkK8/AooiJ2oDsXrMNIfoCowdN3aRObD3709aJVMlzc7ro3LV48CmPR3N/Ztjv79tyggAFdLJEFnhzYhKlw2RGrgAwQo49lKosWGVbkSfU4YObLqI=; 24:5osD23ZJki/O4KLAyC6TwhsIQ779rfOkfsHv+M6EsEqhfV5l8vZ068BovD4vyr8F7o2Ptk/1+o3e0K5KZG+ZwiIyRhtBR3ah/VWxa8ufYmk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 7:o0MCRT3V1bQV/to1l0/K+AIPI1GoPUZvsUANOFjOTT3hiAXOQyjM13CG2RFcjjuAczFb+RhPbI1qHHlRk5sxneaQcRFJTIRcRMJ1azUkPhTJgNkY5v0QCQT6KA6hpIG/mFTI8A5It4+PyKFGzkVOcUW4/9y7IaTeumkK7klGcTnZuVYGnMkQuWwZNCj4WC0p92wP1skbk4oWdAMgGlme/+ljCAGgTawcWQ1fszpyaPV1pDgRVudOfKDjUsEsv9+x X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:41.1968 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65b38b42-988b-4c70-5511-08d5911f73a8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4217 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha For consistency renaming txqs_wake to wake_txqs Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 ++-- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 2558a94..8b0a080 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -777,7 +777,7 @@ static inline void update_link_status(struct net_device *netdev, if (lio->linfo.link.s.link_up) { dev_dbg(&oct->pci_dev->dev, "%s: link_up", __func__); netif_carrier_on(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); @@ -2763,7 +2763,7 @@ static void liquidio_tx_timeout(struct net_device *netdev) "Transmit timeout tx_dropped:%ld, waking up queues now!!\n", netdev->stats.tx_dropped); netif_trans_update(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } static int liquidio_vlan_rx_add_vid(struct net_device *netdev, diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 478c20a..288096b 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -515,7 +515,7 @@ static void update_link_status(struct net_device *netdev, if (lio->linfo.link.s.link_up) { netif_carrier_on(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } else { netif_carrier_off(netdev); txqs_stop(netdev); @@ -1822,7 +1822,7 @@ static void liquidio_tx_timeout(struct net_device *netdev) "Transmit timeout tx_dropped:%ld, waking up queues now!!\n", netdev->stats.tx_dropped); netif_trans_update(netdev); - txqs_wake(netdev); + wake_txqs(netdev); } static int diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 7922a69..3cbc65a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -522,7 +522,7 @@ static inline void txqs_stop(struct net_device *netdev) * \brief Wake Tx queues * @param netdev network device */ -static inline void txqs_wake(struct net_device *netdev) +static inline void wake_txqs(struct net_device *netdev) { struct lio *lio = GET_LIO(netdev); int i, qno;