From patchwork Wed Apr 25 18:23:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 904656 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="J7V9hYw4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WT9Q1wfQz9s0v for ; Thu, 26 Apr 2018 04:23:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756472AbeDYSXw (ORCPT ); Wed, 25 Apr 2018 14:23:52 -0400 Received: from mail-co1nam03on0044.outbound.protection.outlook.com ([104.47.40.44]:22992 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756444AbeDYSXm (ORCPT ); Wed, 25 Apr 2018 14:23: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=gqq+r6wwVeJMfqueHkjO+A5EHbA/tIv//gMEeEWU//I=; b=J7V9hYw4t7T1njLlFIM9r4sMV9+eoFCqkVxuBD6OWpAlFXP2cgR3g4mM4LpZPWNwao3ugLFcgND1NUffupLQjqZuJ3UzBNTW4PO0nxgbg8Xkw2uP/1+A4X1STIwNQ7ZegwWu25eeL7Qj2QrlRk75xfYKzwEycvBAh/ojyfpsnVE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by BYAPR07MB4214.namprd07.prod.outlook.com (2603:10b6:a02:be::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Wed, 25 Apr 2018 18:23:40 +0000 Date: Wed, 25 Apr 2018 11:23:38 -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 net-next 2/6] liquidio: Moved common function list_delete_head to octeon_network.h Message-ID: <20180425182338.GA13867@felix-thinkpad.cavium.com> References: <20180425182301.GA13840@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180425182301.GA13840@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BYAPR02CA0010.namprd02.prod.outlook.com (2603:10b6:a02:ee::23) To BYAPR07MB4214.namprd07.prod.outlook.com (2603:10b6:a02:be::16) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4214; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4214; 3:+Owt7RqP2MB8NnqSKA9N6LZHB0BhtEbgRGtQuY+sBT/Sw0Z1tbDDR5PjY1HD9g63S/ole+iPmzYsRBeEHBN+AOH7vyuV9gSD8elaxSi9ovRxBqdD8En6qws/paL7/AJPFMgWZF6Rfs+Aq27WBXpnbdQKp8Ca2hEGbupYRm0+SDXz+CQNVXi7IoZpEHxfqaxhQKaZsgl4uAbJ1y9S2iXqN1oP4s9J56P5dpfe90HE0KZ+1c05CfWYTEYe9Zpm9rKl; 25:vKxcjsZ6sRLW0WEX5mv4zSsPtM2/2iTvHgLioNee9eJfBXp9y4oV8AAajhQldLCuxDfFxf3c3af4uW0fqjZZGu7Qgfqh/QiujPZwfY8cSKbPLioMmxgOKJuFA17H+8QdNwk9xP1EMmKuljd1yWf1IjccP45Vj6VE4FvQQNNa7daRwCbf9vTWDbhnVHj6Xajjkw31eILRuDjMymYEXXOXaIcgZY0oXDrTXtf3+zdNErWF/Qb6EF+pDFyrox8RivJcTZAKKL6pHanq4h/gJGp9ecoevhVxPbSEwDfWIGmPunG18kGay1pp0rCv5NNPGYgnfVhGdQbLmKKCm1hhlJ/h8w==; 31:8fZsh1HVOqhrLIaHGXWgls4pfSmicnc6flHC+J236/st39ezvNsyoWSowPTLU3XRT8qapXfx1uZQPdIBb7oAzkzJtBGjvuy1pnYJXL3EovYezD+IbYJ2Pob7kWHs+ZVe9lVCh1OjDfIODL0B+Fgv2RByoZ8ML3fUobEv6z6zUaoMSNtkqV8F0M2N/o1oD3UAF62KAbv+Xm9uotMgu3jNBbuNPvBGCcnNSBHkf3ifYQk= X-MS-TrafficTypeDiagnostic: BYAPR07MB4214: X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4214; 20:lKTt8JNaaEU5sh0o1pSOre3I/M6urD3HkGAkMRo3rjX5kvr/w6HOVQLLqFqLdDf7NkjfupChLu0Tr9X48N1VEBOnUX2T2VfZYpt5JKU88tHZfPugchFROpl2edf3Pyqk7yCQ77gYcE08v94cxJbSY1d4AGXFmE6zoFCXUQIQU5NinLU6dUiapn65NH+ir5RrZulyqg/AKryy82kjIcs8z42gOY///P9e4cXl0C6hmLMGN134pp2OCKujR+J7P0MlUDgGC1eRNdW2FvFRjsOl4HcZlq75rOAMf6W0yRKKRySGK++/cVnaSObrx1htbRd21WpUV6795Jdwj0BMXruec2OHCfmeOvNrdQUsYBHOE5fQV6yp8PcvsnovZcDeIok3/mi04SXceBQN3aP97CiFzddZ6ZxGQyllcYS1hpDSVO0HzSWv7+aYjd4Z+z86gYJxQRbuGDPPDqWD+1MYyrxMWKJC6/oYHHyLFb56KnjW92ZP/26kAlQ/WFA15prr9soP; 4:Yt0+J1FypwTX+WCprM3Okqt616+Ss3NBvlfq0ScWAy7RbwFzQFeVuLtba2rR3qioBzZXAgc8T0ej9B7/T4Peo/2q/vMgRrpBVGd7PKAQqd/T0IzHvzPg6XrFo0CJVn1C/+1SN6JAx9nKH1un5+CG33NN/AkwlD7czcsgq101TCW3AmoaAfoDI6EqgqqZ7Fy42VI57LmJehFfa/A1dP1zAXMNC2QW4t2DyxxYDjwKAcuKSLzLCo/tF2Pz8rjoFEx0Ovk69Q1n4qXAfT9agysonA== 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)(3231232)(944501410)(52105095)(10201501046)(93006095)(93001095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:BYAPR07MB4214; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4214; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(376002)(396003)(39380400002)(39860400002)(346002)(199004)(189003)(2361001)(1076002)(6496006)(52116002)(8676002)(76176011)(476003)(2906002)(53936002)(33656002)(305945005)(7736002)(107886003)(8936002)(86362001)(486006)(58126008)(44832011)(26005)(956004)(50466002)(186003)(446003)(59450400001)(386003)(81166006)(16586007)(11346002)(2351001)(81156014)(16526019)(76506005)(316002)(105586002)(97736004)(106356001)(6486002)(478600001)(72206003)(23726003)(66066001)(6916009)(5660300001)(47776003)(25786009)(68736007)(6116002)(3846002)(4326008)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4214; H:localhost; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4214; 23:qkrPvQ7vw+D/Q15az5vmQVm67PT7DH+Wj/FxDHBwbvVZveyD7W6u5cGqM3fzjM8wHJnK2IyQWzPH84hi/GUvKzoG00Wz9FzT3eGPWLbopd7fESPd/x+0YTCTYKxgnGYLzpB469/OUENtTBUxVYJXGJvqB1LBNcgMpwz+6gGOyCTF7TKr+KS4Srae0+60HvAueHgzrXHBaJR7wjyBQf4sJIWYfRf2FivHriAkGiekTZz/lLhB/KzdyImLXym0K9yVZr9lG+oJjWRMUMnP8Lfynjy3SjQ9xXJDgGujO+Z1uSx4V5Zc9PwwLbaM1M+l2K8rAsDyUCPk3I5JoqgHGmSDgu2jPBsD0KxXnnDlDV3U2LoQB0H2+fa65sgvBI7Oaw9DQne5UpSE1SnGhUvzU4/R0g7AO2DESCnDLzJuvNKJeGhqstg//XZL1zDbYqiNcObQxoTx9r/WKuYKTCCK6d/Cd+bKtlZrnp9pzY6/5aMYgM73f3/uyBR/PQNqnvwGFBl8xQN3dtXdOY4/5RdZzLU/JeNwVeZLhgLGsuTHBfSKN8TEnw90Ul1M7XkPZaZI2jsqebKZDJiZtEd8VgWIhEGkbSZViwxRRR900+RNTEcVHvky9VKL7GBNo5X2TMtpxkrz+APr+rkBXxzoQ8UxPXrT11WYiGLrAk4d0TEkzfWn12MZwNMeqloxZRiVYxsGfd8f/kYRvZLTRLBfcOEURKqskbPPNgW73KDbgaVbJkopbjU05lCjCSUAtQz3oey72Sjr0sYPGgQGXO9ph0S4iTgVt42ACCqN/Vm7wv99rmF64dTUwjNKjUuQPLgw587RiI4BlumDix1Hx/Ml+x/M4gxVSoiUT1LhNv/xh3O5OZ9jBp0TSEq77hWR2GwVBtY+6ZLf6qcczEWqLzOT55pI3jEDeAN6KyfdlWdbWUDEhTJbkOoMcWcTQr61mTl8x9iVuxKcOcRZex3rB5f3GHX6nOpTxxly+u1M6Wa3OCFvm0JaR0fq5ytMHVn7S2RgSuC3MQp+2BjdgNGpCwco8W9PJTmzcSWLY7TiyZ5ctja15mAtIGYPBPpsyH6520+I1I+rb1zkvG8ePgN074aEG3opBDXcSX0D/MmjYij+Cypm85hRdhFECsSsF+aJU7VhlJbMG2JPR+ZerdjfXrzTALD9I9AGpzY3IT27G06UHzmJy83nDOOfw2LitB6CDltxjHicvnKHpmG/KqYNG9uwJ0E6SVwSiJKr5zv63a3DhSXzIf/g72JoUd6MLLKy5lZNvJWEXplqOGBemkMFYMMM8n6igiYLn4uOA3FR9L9UbjZCgelcCWE= X-Microsoft-Antispam-Message-Info: muk6V5lG1BDfzfAO3frP4Y+8iXin61TwI35RxwE/e3LwbU5numIpDnaeGAAEr8f9PQ9r2fVFp1acB54dcXIJDKffiSdS5NdyBUrs6zc39TQUgXrpuxjAK6LKzTV//WlmU6FaEMc5amVaTarOkf/hZH3/nU0SslfvZJOEirGqbAgxWjeHmW6HgOuk3cDTO5D3 X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4214; 6:NwF1tH1sCRcicSWPFubZzRZ1islA2iEP6/m33OhHyrWb7iiKlvnoZdnC1U1pE1I+qIKzwqnsX9zsQmiZEa6AOrAG1/ssLdsql6aE7515U8/tVi5HzUDqhXFAsxrfnliE5AXYmp6o/J8MoSPgs4ucrp/AsaMd/gPYO7SNGCV6n75VTJCL3H9CaHrWwIbQcdA2kRfilMSPBuyLa1jjs198T7UWFIYJP1ZTcxMNWa3c76wJTASGCDG/fol8FlooBq+WBdbJOFZyc6BB5yZ2ay9TXkPTQQynL4n1ayLo848s8nMjpSmI6tUnmDH7CEnQEAfuwzyJ79Z7UqpTaMKXsDQhBA8Li2jbxOVZ1MuVGZYqWOgGf89LlAGUxzdRxwyrJmwIPyr9rt08slSpYBfO0zaWv5xiIOevKXCGK2rXILTzD/Ts51iPyH6LCEvEosNY5NwHj5nM4bm/dDplZvN/v16rlA==; 5:GwFvo+79gWxy8Cy4rQtrQxOsm5xssxYrERtevaFhDiTNelGnyVa4COIoa7jHW6++TRfJiVa8sQOhGZMlA+sEFAg5a/goyNNWjaBzJrJXPfZD8eCh6pOeCS1J/wYY+/JV3hcTe/z2U8scGYv+1ejp2wJnaXXSzRALrqOZZouTWqA=; 24:P+7OLFkMuqv6Ne5EG8pv5ITCvq2B38HNJ8asYIpNtZ2WegMUZszTTa7WlOx2lVNm52EdmQS4tU5+xXyWDXv0QWJuVPQyJupas2ouVjYSWfI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4214; 7:1wnsD9oYtfi9Nhsu+M1LXtPpxedi6A7K014zPrSvOGxZrf6IU11OR2hA9LarUduBnkG8Ut43KPD0hIWQNcfp+LCJ1Sl1gM7COWhenxHB2lzNZQZkdyKX/x/tTfpXKWUCKhify1VricwYvlPxJiUn0NTEfWNOcRmKPZY4/LhJZ1nEd7B8gHOsVVHDqb6IFLthfA8jvJtH1PO2nr+VPtDpm5a44x8Tb/34w9a05dwGYdzeBzvB9c/jNlZI5hd47/tp X-MS-Office365-Filtering-Correlation-Id: 3ecdb401-d5d7-42fe-346a-08d5aad9abcb X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 18:23:40.9327 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ecdb401-d5d7-42fe-346a-08d5aad9abcb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4214 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