From patchwork Sat Apr 28 06:32:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 906048 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="jpdNoB3m"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Y1Fm5X4Pz9s06 for ; Sat, 28 Apr 2018 16:33:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933419AbeD1Gcz (ORCPT ); Sat, 28 Apr 2018 02:32:55 -0400 Received: from mail-dm3nam03on0041.outbound.protection.outlook.com ([104.47.41.41]:23924 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932841AbeD1Gcv (ORCPT ); Sat, 28 Apr 2018 02:32:51 -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=gqq+r6wwVeJMfqueHkjO+A5EHbA/tIv//gMEeEWU//I=; b=jpdNoB3mEMBN/VmRIK53psQOOZp6nIwYHZHNnJ6ZTcJbm08Xw3pd/mOmEvAHm8zCFNR5qNr8+RA1BVRMyRnVSWmbdOjUsDaTloWEKogN6/vuxH1u52K8nmc1H+rjSsYpstzNPb+nHwvGD6a6NPo/WGJR/dnCihvTC2r8AMk+MD8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by BYAPR07MB4215.namprd07.prod.outlook.com (2603:10b6:a02:be::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Sat, 28 Apr 2018 06:32:48 +0000 Date: Fri, 27 Apr 2018 23:32:45 -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, felix.manlunas@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH V2 net-next 2/6] liquidio: Moved common function list_delete_head to octeon_network.h Message-ID: <20180428063245.GA3258@felix-thinkpad.cavium.com> References: <20180428063204.GA3229@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180428063204.GA3229@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR02CA0015.namprd02.prod.outlook.com (2603:10b6:a02:ee::28) To BYAPR07MB4215.namprd07.prod.outlook.com (2603:10b6:a02:be::17) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4215; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4215; 3:+cP4Xa8lqqD3Lfjhl7k0wApKFRoiW58a2EPBQ7khtFzF7z71RvpnTbx/2QuHM5c0VyeqSroazWhKcI0iSYHhxy1ugsYAfyzOgZ6uavyiPhJ6e34WdTJe8AIBAS7KQpp+2PvvrPPXALqXFcX35GkHnsN4sFOnG8Vy8IW9Eby0BFOW3G9VLrYqbrC5/LAi9gIg7BVuYMiONb/4UwMmLtt76B5g5iZTdRJSmmza1q3qwghGGNjzSWfkVY4ePzUGKvTS; 25:A/7ylKhTXEh9bKM6/TWUP+y7XPY5jxngoaaUX7ZbtnmKlaK0piKyVnvgAGSvxxzAAix7vd9YWUktiQXOfA2M9kryRqtfcao7tWOMW0j6RUiDalwjJllJBPSdEB4gKnSP2zp+nj7nWCXqwkD3Wl06saelHd68AnobZRn1BpVmNNQFT88sIxMkT+d+sYP/DCOZQfLgf73jJmKjeApg5Yl5Aq7tiOKthQzLVIgeUwy+5GB20FIKOymTdG9gK/OR8kBYnF19MOqjKcVOlDZVNgQXB0zGxoxFlP01dnXsG41pWLq6xC8HNVgDfO2/k9wQV3K5DG+Nfm0+OWnAUnx5rmz49Q==; 31:KAfhfrX/HYv6997xswI4wQVn1w7ahDnD7lUWaoUZL7Y+pawko5FAXhiu5hnf/97bZ7Ksvt0MPx/Iy2RU6wr4dSCr+8k3xpvhoICrDJyBfTRGbo90Z/k/A7NKwv6guUBEH1Y17jA7GgugTHc+V9jBkNI5JSt3VkwBp7Q7erPH+/cddGeiDfS/ZbY8Wu1/fV+ZYG60LAWctbYDDwWxmRpn6mVNWv91yoeiZwo683u4/8U= X-MS-TrafficTypeDiagnostic: BYAPR07MB4215: X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4215; 20:UZyaiDkSzHwS+Og/Fo6FIEWDuJFGgu3zwpOmDOfpC8ibOaZeLvHzZ3nCvBXqo4zBU1THflZfNUMJMzo3Op5w9Pr8DwXkWTmNDQAll+b/N84ohamdcnE2m9brE5JIR/YTXLQQ/QDrXKhtKxaagE2sen6fbJZ/+Jmw2ylmcIQPP+m0UYjL3N5T3qqBKdeJ6GcEHNp/dgK0t7osMA87XSuFN8igh7KY5cqm3JnvTorSbFzqEFPORzUVftTbmpZTuWryfTKMhu9WPr11E3wMRSL9kG0bTRLbjNN07pFT1iusyFLPNqK1uqDRcTtZfCeY0VPhbk40pj6JR+I7y9s6guhR0ke5h26bqQjILy8i3AdZvoar9GkZWoZENicnH4sbIbc2rGRq/yA7XoNbCBmVfpWSA1ipo1tPCNLJZlfcMKsABXEm10EfCZruW/xtLxX5e9H194NOfs9cqkWvKrjW1Xb3YFpQs0Yk+JMrli1B+HSgmdDCjXCdYY5vPjOypu4fSZEY; 4:O4GAAM8b5K9bhqJ6hhvNhA7BGc0q6TdPJ8vKZcd/2lsYedRQ9MKCx3A8yGVC0T5cyHuiirKHoAglAJ3ZZp0zA+2O1B23yxqG3+jK9geQCdJUolZ+IfCekqFDhg4p4pgH3b3xHmklFVBOQlxHGIZWuhEqAz59jbqbVBOIzFR9Oj4iLHbuiTRk0cyIgYrh1KMLM8H+Gpw0Zkes4n/N1phXMHCben+meFxDBhdIl5vvgEW4XtjxB3dmYSxgTUKlE9tpFjJAdrxjSsVcMCHtnzekOA== 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)(93006095)(93001095)(10201501046)(3002001)(3231254)(944501410)(52105095)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:BYAPR07MB4215; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4215; X-Forefront-PRVS: 0656A4403B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(376002)(396003)(346002)(39380400002)(366004)(189003)(199004)(50466002)(8936002)(476003)(52116002)(7736002)(5660300001)(106356001)(44832011)(6916009)(25786009)(8676002)(16586007)(305945005)(47776003)(4326008)(2906002)(76506005)(486006)(97736004)(446003)(956004)(53936002)(16526019)(59450400001)(11346002)(107886003)(3846002)(316002)(2361001)(72206003)(1076002)(386003)(26005)(6486002)(66066001)(86362001)(81166006)(33656002)(478600001)(186003)(2351001)(6496006)(23726003)(68736007)(76176011)(105586002)(81156014)(6666003)(6116002)(58126008)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4215; H:localhost; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4215; 23:Qc/cVyPO9PmsBGSrcC1bCYnSqqvI6+Td0BGkT3zP7zpism6LXNv2boF4EnT86TrsCqNXsgyblszJpFzoCqwvCb+KaJtDIZjAdSiDWZzxNjyc2yQ+WiOaEIXWz2MPDDSbCV81QVYepKGupCQrbnOpzP4MYj963/Cg9W+CDaOFCTzjXPTjO9tn0JDz+UUQbrFPLk0V/mXrEVOn74g23HZLkTIjCqbxgUQtkQI0SDGmhGHkCOsi9ioL2NsA7QJSq9Qj0gWBBAu+74I7MwJmUK2XEklH6r8FnNynxKW6kynRVl9b1aExLhAV2ULr96pwhLpbH2g/iIyOFAimjNeKgJ2k6oUEFIRhl5jlLBdCyPxkOFt0PMsuzWJ5OWxcqfcJkFPeI/W8zd4gDe58WQqjgP2Gq6RZjdjg6F5/IAaRAE9VfuLtFCGEn2kU3xfvxXvTy51FZpF4luBIjXqx8zj9/EboN0mtDmGrO+lsHFggcdD2mcQ1qHupsvzCVRJ83jyj7EpnH+hnj5klBtdlVwnnYIC3aF5OuZOeh5Cb5+Po0iCfP+CAdO/6MfGfTh7ebZ99mEG50VzlsOcVSXW5k5m5lsNHWoE5FyCcqz3icwKbDSlzw1/SwG4JA6aYsUhS/VoKK6QTfsD4FvgVsKtBb/5/n5OJdW/T0Vmc3LaaaUfqujSwBMTiC6M6UMeqJCEB2aFg+Cg6+zI+ml2sJemf6PKqEtUyqMlNrriwxIO4lIR7rPzOmardYb3XiOcM73yGh805XMvC0ksWfNOQlX7m7YC5L69Xz66hRa4WLErea/04u8/dhdgJ9pVXsYGW3y7ErtqslPTBBTPSlZnYkYeLoUNo4vcWAqb26JXP9uJm97cHesKoid8e/QLoSCsI1509SY5RWapwxzs8Bd0gG2eX/EKwnOgkOJ48AVTXwj1hh9RPPqXQ7W1kErsvvz70tx4HI3qYvZOYu+iLxmxWx5A332ypj5lEtadLg81wNKjEO9tclofvWxNb6NymdxCGdkBHomC5+NIaA6rZt14enwBllZL4o0Jf16Ip0Flm9JfUBLPlVcQMy6WUsP1Ccwq07raL4mgJ/SWnDYLTm0gLQ6LoWl63Jgfo++JRKX2Fj3kTHfGVY8YejRbCcE13U04yfRyn6jC7GVsParyE+qwpYNEncTyG6FxoQD0krFjDCJgLPq/f7J54+YFejtWpMiEft6FrcEeLMaDsIXSoix0Y3e7XUOmHOSDzsauNEocJWOpQAJb1akzMzEQzLTi6kzfmx5cTZ2doOv6vihcURwD2c3UBxy6OZ9iCox0R3B90GHLDyC6ejCyqB7uWJMqBzaNHbIvSJlFDw+oH X-Microsoft-Antispam-Message-Info: gEwixASYLT0enJVLsHiBU6P4GJjix8qsRjDRVKiug7izZnn/vGbSbVVXgDfZI5XNvrDWSvqQxh4dqG+4JuzFSlMoPYvz4KURreAGGVWuATqJzEUNGsgNR/hYKffP4+Dg8elPQ/g3m3S16BqJaxeQNlvPXs5Pu3Zhu0cTcIx9C6kL5KHhdnYN430YAbtD/Wqv X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4215; 6:jaEYXxDl2A18OtP2/qbNlNqRaGBoEIkuUf0nNVusw2MMxhJb185RGvbVHiHD1HLIM58E/0r0VOh0MvbRnnBePB9Y8hvPS7c6BKyaChWqxtco5MZ61UNerqQYHTFN9Il4yppSdqmpjr1SQFDvZ5orawJZ8Y+oUzRhJJRJd+/yyDJDvAKHRbIMTJj4WS1AhazLhc46e6Ie7Ix/eDCM6djrAYxLBtR7HFHm7Hpk6emliq4pt7RD2kwa0vNp+Po5SKU3R7odPx/IIHoOTvFaBwFpPqgLV6Id0QymkWL8yJEw7dYT7H68eBXgG4PsNyAG/aww7mXeKbPrtIyh/lc29QwVOmo+e/GlMiloRy6G+4H15g+bP/CYMae5ZkhABtxPfss9GRxwBaYfd2Cm8m2W1tkMWxU8UFc7Nuc+ch86h35lyJzCklCXKF6WSOa+Je7LLB2kIqDQqA3tdsWVoxj4OQwnzw==; 5:8gX4lpFUydr+iJ0ExGabG5ntipea+KM26FeATLk1JEZKrL/MUgeSgGRw+walQuqxfeQ8jQ8PqU0tlKExiuGMuPLvB+X8jtWV0S5APokHXEnHF/qhkgCuxTwGz3pHfU0szLomNTlqAMTyKT98lGR6DBuJY3oerkjh2plveBLyfQM=; 24:hjhif/vj2vO5LJ7R1tMLuIm9MhTl7YXpfuIAa9MGD3PO4LQ7OL2J7HMA67kTVZwjn0XONGniFTatcCx7r6XWRnJt/A9yxUzArtPFucMU2bg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4215; 7:MeCJbFAuHrRxGx8c3V1+r/yRSSwSdzEukZ0njXrp4gYjAsL/oKuNxKrVBrsujkQOIpRHjqCvqlZa32iI/rMe7v56DXXf4iMjSLwKI9XzQhAkdIlNrCUU1VvGtaO9KiTtDlaVgo2lRJxtazUSUXnC7uo+l5/ogB238aLWAuf5OE5P+xspc4/mWguXOKlbvrAM6z26aiVpSrWc6fIEIWANgCC+XF5013QxK+Ha6UBV4h0B//wTnXBCYwklv+6tBIyp X-MS-Office365-Filtering-Correlation-Id: a7d06572-b081-45ec-cbec-08d5acd1dc3b X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2018 06:32:48.5216 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a7d06572-b081-45ec-cbec-08d5acd1dc3b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4215 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moved common function list_delete_head to octeon_network.h and renamed it to lio_list_delete_head Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 23 ++------------------ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 25 +++------------------- .../net/ethernet/cavium/liquidio/octeon_network.h | 19 ++++++++++++++++ 3 files changed, 24 insertions(+), 43 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index e78b3d8..8b3ab98 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -542,25 +542,6 @@ static inline int check_txq_status(struct lio *lio) } /** - * 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. - */ -static inline struct list_head *list_delete_head(struct list_head *root) -{ - struct list_head *node; - - if ((root->prev == root) && (root->next == root)) - node = NULL; - else - node = root->next; - - if (node) - list_del(node); - - return node; -} - -/** * \brief Delete gather lists * @param lio per-network private data */ @@ -578,7 +559,7 @@ static void delete_glists(struct lio *lio) for (i = 0; i < lio->linfo.num_txpciq; i++) { do { g = (struct octnic_gather *) - list_delete_head(&lio->glist[i]); + lio_list_delete_head(&lio->glist[i]); if (g) kfree(g); } while (g); @@ -2570,7 +2551,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) spin_lock(&lio->glist_lock[q_idx]); g = (struct octnic_gather *) - list_delete_head(&lio->glist[q_idx]); + lio_list_delete_head(&lio->glist[q_idx]); spin_unlock(&lio->glist_lock[q_idx]); if (!g) { diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 83d8bf6..7725b3f 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,25 +285,6 @@ static struct pci_driver liquidio_vf_pci_driver = { }; /** - * 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. - */ -static struct list_head *list_delete_head(struct list_head *root) -{ - struct list_head *node; - - if ((root->prev == root) && (root->next == root)) - node = NULL; - else - node = root->next; - - if (node) - list_del(node); - - return node; -} - -/** * \brief Delete gather lists * @param lio per-network private data */ @@ -321,7 +302,7 @@ static void delete_glists(struct lio *lio) for (i = 0; i < lio->linfo.num_txpciq; i++) { do { g = (struct octnic_gather *) - list_delete_head(&lio->glist[i]); + lio_list_delete_head(&lio->glist[i]); kfree(g); } while (g); @@ -1629,8 +1610,8 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) int i, frags; spin_lock(&lio->glist_lock[q_idx]); - g = (struct octnic_gather *)list_delete_head( - &lio->glist[q_idx]); + g = (struct octnic_gather *) + lio_list_delete_head(&lio->glist[q_idx]); spin_unlock(&lio->glist_lock[q_idx]); if (!g) { diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index ad5195c..3cb3d72 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -563,4 +563,23 @@ static inline int skb_iq(struct lio *lio, struct sk_buff *skb) return skb->queue_mapping % lio->linfo.num_txpciq; } +/** + * 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. + */ +static inline struct list_head *lio_list_delete_head(struct list_head *root) +{ + struct list_head *node; + + if (root->prev == root && root->next == root) + node = NULL; + else + node = root->next; + + if (node) + list_del(node); + + return node; +} + #endif