From patchwork Sat Mar 24 00:37:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890347 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="T56Nsyh6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M1g3dHDz9s0y for ; Sat, 24 Mar 2018 11:37:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163AbeCXAhZ (ORCPT ); Fri, 23 Mar 2018 20:37:25 -0400 Received: from mail-bn3nam01on0075.outbound.protection.outlook.com ([104.47.33.75]:35390 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751814AbeCXAhY (ORCPT ); Fri, 23 Mar 2018 20:37:24 -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=JlrlSIlEKxsGqSTXK5zK4Yv2Z5rIgTCgCC2vQpLNviA=; b=T56Nsyh6aMrRdZyaa6Waa4xMHioahnjT/zYX0jgV+cY8Q1gD4jAiXO8IALD5+sDXEBjQN+Sog6Z+iYZ9jPUvDe6YMvjVsfENOoWr9uT6WXKbs2bhlaP36p1dcQyiHRi6V4f8+uc6JQjMg6Af17IRP2D7iDatT3hAnKpPDCwsc2Q= 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:20 +0000 Date: Fri, 23 Mar 2018 17:37:17 -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 04/13] liquidio: Moved common function skb_iq to to octeon_network.h Message-ID: <20180324003717.GA6509@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: CO2PR04CA0122.namprd04.prod.outlook.com (2603:10b6:104:7::24) To DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c9f6954-4170-4c44-4631-08d5911f6713 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:H5UhkTGAkNpVEZDoldsEmpNTd5a6G8xKLTxvlPwVeR9sxwIR1azXCufkDS/fuPd89/rhUNP8CksKQheiGbnqMrf0UlNiYrkvvorj/FCH9hOA8JmMzmjxYlFxMrQBbik5e1GDPrQZLtR6HF3JJO7hLsO1msUSRFox1P39llFhUV0wFt+GnaqqIHDCiKG1K7qzbx4+IrJDfFFa37iQM7e9ZACIEdrehLqqJtQTxpDIzOIwCpFxnLWO7AXvzQ96iZVj; 25:9BgkWuc/hyz+ZfqSIQf3a0wYyAqL9Gl/Rs4cKZM3546nWTHUoqLd+drKqM/3h6rkrWDTEn0zojM0LMJ894vZwZmH7W63J86DyNevQ3haMA59i/JFqcUNlFWnVGOf0KAAv5LUSOnZ0OLLr9+ilMJibUKuS2+/DQ5kBcUqHizBIfS5npyKpfhAjkFk2dukxec5/xMtvnXW/tl5m0hyd43RazGDy7jJDfg0RgHiPegTDBnRnzwXpwFwQy9xRcdg7PBne6yRvGNrAS/WXxAxismWtuv2p7lFo0H+4McaMUkiSInd6Mvs9+RYauyp3XkDmHWW1v08rGYlD1guR5oHHoTwzg==; 31:o9Um8GZHe4aSCXLIcCLq4yYZzHHZ/A+F5a+ix8eL228BFiQnERESnzJmGnFjNph0BA1OsbOoN3ESbMMoGQb3hYDxMHQNnQUwQ7kU4JPg9iuhYoWAOwXJkjYUE/VGBelAPQW2+TVJQsEdewPk+CZpnt2SN+P0ILTz7gaXcfaBWgMak806I9W71KS4dq7KFL23Lp+2o8A+S6LBwr1iQv58hI2W7OnS+83S+bAzbnAKMvg= X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 20:M/WW/yxGvzQQN+sPqJS22itODN6bpAvVKbqL52ee4gsxZu78lkfSowedtMVUYymDatLTAROheqPYc8D4FuwfxohBuPkBNHMHGDznSv8czn0wKA/jGQCG/kVHeAkSgTUN8mEQbFRxjkAR5DUyvJcNKUJmh6dkPZ4v7Yb68hKpkO4r21DDI/M8TUQu8QBv6TuGl3efC/E3OyUN1HsW1jyA3jcrHyXyj7qBpX5mEdy5sfybLJ4tjFHYLSaAazxmuRNq+7HEtYZP8DpcxdM4FLwolRYG0mifISfTgV1PoAYoZZlj3aiF+nXTnV9ntDMA4s9dhq8Z0ttC5UWETGo14ORS2aBAUgdl4HNhP3T2O3oyLAfTuLvqeMnG9tbgR6Yz+FWUnJzAnWZHwb+dP+kpZom0NKHxuBoBKauC0iHaijWdmRGIJ2xrwwmqD8x51zrv7eY+guJZIJ3lbiHgXT9jbcb/EjmXW+XS+vxIbnhVmiEl2C0Tln3cKobYfD9ss0kmcjzw; 4:bPIay6w2Gwd2AZF3BjkeboIs3ORoRZgm4UesWuy29Vt9XlTBNO8Q70gqCspV2+a7AU7UdGeGwQfg4chYNzSfIrw1y/IZESdvTB8VNqBZAI7JETPyAnx7kXk6Ey3+6j2f00Rt9B4X8ZQXZiJs5TtN+p0vuhIiIOkNpgjt2jbkAFUXyhcAxI2rQLwPSWk3HNWjLLyaUDQiUc1q/SPRX3WaSnQZvM7tg9/IbP7oxtLbI3iHF6tXctO4BF4Cb7UuZ1ugy+IEOAVDZgBhgX6sOV58Bw== 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)(6666003)(386003)(2351001)(33656002)(76506005)(105586002)(7736002)(5660300001)(956004)(8676002)(2906002)(305945005)(186003)(4326008)(52116002)(53936002)(6496006)(446003)(11346002)(16526019)(107886003)(68736007)(86362001)(478600001)(316002)(26005)(72206003)(47776003)(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:SJ7znKEh9k3fsyTr8cJ2g7uMo43+dhVmUjeYCjSC+i9/MmBqnep625cdTM2XEdi/3pDTGc0HB0cu95LXQagXkDJCUMIl03pQTHnJnXfZ5/dhu41vGFqeLDRz6DLQbG2jTLR70w2fQMZdPh/CKY/U+932xMcPGFY9+Hc544j38Cp/KBaPV4zE+zkYZy7btL0gUj3Ygq2N8xdNpzb7JLa4pZsOONfoedQlB+VZxdLyXBItDoIZgiNP2Rn66P81+yajqRZeKwqL+JwEXTYXBmk4iNg5HzzQ1ptRgY9n9xAqqUHHIrB6heOZSwEniZEIHyA1AZvSjwubvpwyijxkzJdWrEzfNO43SbN+7aG2j3heKW2knBTTNRa2fMrihIzA2gWXH2WElWsGn71LlsIEC18/DxuDM9EDmgmP1GdVs3UonkUKiABdTRx6Jaw99FPwge5KqNCGzavGnZvDTs7f63ED/ZiM/w2mcwXqs+ADySruEIKTjpOM72ssZ5Ys0rK6tcS1ed0Fs9z/muWnjoJYsf6WQZ8FY4I2Zdw27d31rROfhDZxHc+Q+jG2tOuuBbQnIKfpI+Ibg85UNpfEaSma6QQdnRcS9AB7yFlZziY7W+n+yhHdd5u46uNyBTSeKtZ/54xGob8UM/ZrP1rEu78DLKt59a4p8tumWp4GfBeba3VJs1ODRKzLBOfq/LWaX2dVAylBpy4N6hQFegrRoSQ+I5r1NCKJFQqzvtPDBaR4zKLsU7BK56PoPunFzB7CHkGf8DmFSGuVxH91TTKWx0E0FcP4X/hAprXuZ0vA3u+XhqJGKxTjvQu1rVdy2CCIpW9Ihpn1USHsTnlEzLD+0QS11cE9bslposv0RRIYUf4nYD4/dMEYtiwgFWG9fphqHM6aG5WKjsLXto0wTEghtLpxvhlmfDN/31RHXmK3LaPYRcmoA3Tv1gkYOs2JcrJArCU2mcTs0iYhdkvs1jWHYdbUAd33VF572PE2JSiomSr5YKAea5P/lN2BC6yNyaU6dxWflhPnmIalWWo4fTgfLTjnJfqHgOpz1pbeE4vRS4R154wi9VxlNwJnT0BiPzBFQ7Qk+1qP9Qx/4IXvAES8Z7eguQZ7eJ1jU6wi4EvEVAoqDftZOWtMPfC9eNOxFKLO7/Z96Q3mwaJh7wkePDxFHwXHgJJaXJN7EulD/Ie6SQ/ZijizycCtw2QJDkQZSnhG/UB1V2PiBpuhi7aeJaRQoHM8AyIVzcHFf4T/SfTqxOTcVkGr5WI= X-Microsoft-Antispam-Message-Info: duO3m8BNFouXO+pg3ah5n4W7RYgQmwsSAyhOZQGCS3D+JgcQ01AzeF4ML42et0T6R7FD7yAaIxzAY/9RYV2DNZzJx0QwLsshcW6yzqxnb1yFOmIBK4WnkPQGBCm74CRRQwa8BJn0tUqOzqSNR/DQd4BGbXDoeGuR7czVWQ4ZR6L7eKehbLRkTHVgEQOa89f1 X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:6FV4EpggCMH9aM3Ke5hoszfTJu8U345eyM6GlLzic0FisRPsoeW42S228Bzx7ze0WLmXCr9clhxmS/73s151xuYk8OOjACB9kwd0DLOIOveCz8L5oLBBvX3nIDKR35FLbFghBAg4vCQ5IGK7bi6vtDI3OKc50h51sT+ZQTq7lq+K0GypEAH1/fuCPJMEn4R5YkdaYAkoXICfSGhU+OciBxARGZONGDCZnyHm+O7VyiSj6fMemQ1mOAIuE/yPdLmLJERvEBsFafFz+5cQuX3/8Jmo0Fa1mktE8mI7Xt9TAVfz9cNMUs83Rdoar4ZTqVzYgWHbPXLejrhgIDwShVctHfohmjmKo4VQs6w2Pw6G16um1SJ/59ECl3D3Sd4q5GHdaq7Ei7F9mq1B1uIN4pZsZODmo10FcfYRKIMeS40BmruW/ogev/i1KIyMH84j24L3YMCQwvIlIm85XGn4VVlXmw==; 5:+RY6KFQyjclcjOR/NZK2KCLRsk6JkKvrXjW1lnIS9JwSJNtkDJ42Xq5gGZ8SdDaWL9/41HWUYo0BpY+/jGQd1ZLvwUXdN74Gws3Ij1jdz6gjtiWcVyZfjn38q87jfv5ukH0lLp50qU1ZnQZTnJx+LTqRJBk95SVKwplVjcJys5s=; 24:dPvZ6Y2wfjCp/FmuWk/zUokwfmBbHnPVuQkJKfqQi/grkNRBxZ2c6uWnSt0XZxtNSNuEjq2IrgLOyu3khviivvEkqM2zI/IjMucJrRsjFm4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 7:Hc7DWRe6/KCSUEgzKX9qtdLwsJENRcz4iLnqYAa0AyK0NXne6o7CYIrQik6NXw/8JdeXUdwZfMcDS54gxobATEI0nuvpH0C+8Cwqx63OYQSFr1uyCWXkFRYtAJYBnL94e2NzCD7oed4gNW5fMXev3wp/EkHwTL8WSvpRLDzMQoRVfOBW3mEWDKlSN/15pee5VLrtERZgj9jyCxyfAD5DxHfncMUkUOp0s9QOaalFY+fSfAcvmo53cRA/rcWj3J0O X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:20.0717 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c9f6954-4170-4c44-4631-08d5911f6713 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 Moving common function skb_iq to to octeon_network.h Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 10 ---------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 10 ---------- drivers/net/ethernet/cavium/liquidio/octeon_network.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 8e280c5..ec7c403 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1687,16 +1687,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) return 0; } -static inline int skb_iq(struct lio *lio, struct sk_buff *skb) -{ - int q = 0; - - if (netif_is_multiqueue(lio->netdev)) - q = skb->queue_mapping % lio->linfo.num_txpciq; - - return q; -} - /** * \brief Check Tx queue state for a given network buffer * @param lio per-network private data diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 82d70e4..5f0114d 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -993,16 +993,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) return 0; } -static int skb_iq(struct lio *lio, struct sk_buff *skb) -{ - int q = 0; - - if (netif_is_multiqueue(lio->netdev)) - q = skb->queue_mapping % lio->linfo.num_txpciq; - - return q; -} - /** * \brief Check Tx queue state for a given network buffer * @param lio per-network private data diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 0a14d77..cd334a7 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -566,4 +566,14 @@ static inline void txqs_start(struct net_device *netdev) } } +static inline int skb_iq(struct lio *lio, struct sk_buff *skb) +{ + int q = 0; + + if (netif_is_multiqueue(lio->netdev)) + q = skb->queue_mapping % lio->linfo.num_txpciq; + + return q; +} + #endif