From patchwork Fri Jan 12 10:37:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 859739 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="LtwK8e/t"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zJ0303FJKz9ryr for ; Fri, 12 Jan 2018 21:53:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933562AbeALKxO (ORCPT ); Fri, 12 Jan 2018 05:53:14 -0500 Received: from mail-cys01nam02on0042.outbound.protection.outlook.com ([104.47.37.42]:42173 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933519AbeALKxL (ORCPT ); Fri, 12 Jan 2018 05:53:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YBuhvHLhve1i4E6jecAYwpveoz89c5thCqohhA58Le4=; b=LtwK8e/tTAGlGbw+Nb+5I7UEOZQDgQpcPzQKZEohY8iFKnHvGqp7mJNoRTEp0PMxe9PtP1dlPgmGxQ6UPhbBNuYiPUvgDpQPlKiuoctsCbDlPmw5X5UaxJeK1IoB9KrXDK8qedL16aMFgDGrIi28el8K/P6md4RiWiIxdIAxQi4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; Received: from ubuntubox.rdc.aquantia.com (83.149.43.106) by SN1PR0701MB1968.namprd07.prod.outlook.com (10.163.131.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 10:52:59 +0000 From: Igor Russkikh To: "David S . Miller" Cc: netdev@vger.kernel.org, David Arcari , Pavel Belous , Igor Russkikh Subject: [PATCH net-next 10/22] net: aquantia: Eliminate aq_nic structure abstraction Date: Fri, 12 Jan 2018 13:37:01 +0300 Message-Id: <25691a1990f0a814d36adea67fe9afd7d155f6b6.1515682838.git.igor.russkikh@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [83.149.43.106] X-ClientProxiedBy: HE1PR0202CA0024.eurprd02.prod.outlook.com (10.168.182.34) To SN1PR0701MB1968.namprd07.prod.outlook.com (10.163.131.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14c697f1-08e6-4302-e90e-08d559aaa664 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020080)(4652020)(5600026)(4604075)(4534110)(4602075)(4627206)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:SN1PR0701MB1968; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1968; 3:jPJksyblerBGw3oYg4CYaAXmoKZDqsr2bD+aIyf8JMIKF4z7FIyMezeMmN6tuOd+N5Huygz8S8VfFmqPG/in2bHTO4EP/y4xgmYaA68hegmyDrKzihDN+sqFVEdGbeKB210q5j+tqhSG4q89wyWpYoN8bNnsZIrvCpkC5rhekV6MathNYT7bGTqHgDC7pXo/dhObOeoOwFZnzoHWqXVnVsgNJLeJ8gYfZqVwk3Tw5vRDVx1Mb772mlLLrRQffGc8; 25:qzStEGyYdzM5JND2Gq9DDni8GiJ6aesVPgnHk/ST4AAzMBi0Xd8P07zQZ236vSjtvyiFgJfO2qhvj0Ny/WK3BxurKgPVBIC/l2cuNQs0hWUXM/GOsp0I5f8Le+Z+F4Z64XEc3d5Ow8lJ7yioSXByqcpZKWOpqkBN3oKpdD8w+872ihNhCXdU0KZaD5fXtkcMf70WE/UbStPjEhNo3+sjbDrAGowUHi+PMHQA3SybrNaaFoqEucgOWtbMfQMauhk1Rur2XDIMlQjlOkgaxVKlBXiplNen4VroHoWuN3BNP1NI+VID6llN9B55NSbPhX52bdi34X1sFRdOn9WOYyhXHXu0DgkeQfpw8k3fsSFQw0A=; 31:SaPftunfxjzz2p14LV/SUyQhH0qfaKY5UAmH1Tpzy2RZTtcDX3DdnoML7jTTl0wQjl9/WiCY8GrfwFo36prV8N3KsW4MWuadM+3hlXskfySDAy4ukq3VrP14YPRqBd29BeVe8048j2ExSDfaYu9f9taDpIV2rjlcP/ki6QcsjR/5bbG2sfpoxnJ9DZqNyerP02UqsFA0hEGtsXGqR5xLQmmSi2Ya+RoqHU5He6EnR/0= X-MS-TrafficTypeDiagnostic: SN1PR0701MB1968: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1968; 20:mYVp++Lg7MIn36Pn6PpLL9SQtb38BQtN8Ou18t5451Zch9HLRzTohVxw3zsdeTrJ8g/tavL5I2kx3ZaiVKo6H+Le/azGioXtDEie/3SCn3Dz55oLjEU865Wev8FJTSWCjWWKqY70wqa7OIcvlVKg7gGb11ziaaJSMygNNJrS9FLlYNX5zNBzYbcxNkaIXjj4RSbeMAXoo6vsClzyegld795Hoc5et8A+nTJJb4goWoZiRG0KYMbQnGRpd5pUWta78+EoRtVVjnEuucUgxEQP4enX4xkx01qj8k0KXr5wKA9lLfobHkd6iPlm0/wzuBbQnU1dvjNTCyY/UTOxHSIbmsjtiqnDNbJRR7xT9b/TdSLIkRO7Xjr7vxQd8dvjyBep75lVyiyYqxVNT9HorL4w1ff6+KImEZ2yLK+JgUAKSBD0TYyoHJwFg/cu7pa3QjShO6WcrTHUd/DMf8cMZchdOb66hCkbJjU0GeXvqRnPR2XSolRkiy/xDX59V9K5ccMI; 4:SI9l2WjzTIEbgD9MdnzLhfoMF69Ke2Kf+uSlqdrLvplmgxrNzfn5pWcmSpHpPyjftCyxKFjeH1lS3NSD/l7ekPJWONLH5/GMnL6ynt3jNiHVgCJJYZCTj6Qw5zBfT6etOuMTEtjYOch9Kj+1RdieYhbsIwl+49qYYf78nQUjGSu86sf7hJ88jtYr3lFMqeweR1RkjAI+Ys4FnDNUuMVfw2H5/MR031Ol8n7a182tHMKDTDtfPsBWIiq+MZ1WCTC4UxlC6PY/XjsZmAgg7RA5dQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501142)(93006095)(93001095)(3002001)(10201501046)(6041268)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:SN1PR0701MB1968; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR0701MB1968; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(346002)(376002)(396003)(39380400002)(39850400004)(366004)(189003)(199004)(5660300001)(59450400001)(8676002)(53936002)(316002)(8936002)(478600001)(72206003)(16586007)(2950100002)(6916009)(81166006)(6666003)(105586002)(81156014)(4326008)(106356001)(118296001)(48376002)(2906002)(50466002)(7736002)(107886003)(68736007)(54906003)(76176011)(86362001)(52116002)(3846002)(25786009)(305945005)(6116002)(97736004)(36756003)(7696005)(51416003)(47776003)(66066001)(6486002)(386003)(16526018)(50226002)(2004002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB1968; H:ubuntubox.rdc.aquantia.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1968; 23:P8GjkqasJXwCuCJk1TzMyE89sDMQbjeO+PtBiI7i+aollye54tVBzIxCDj/vbSD5nMA7Fqz9BynCr5p8BSENQqbnf8PVyctQ6ziEWxVAGahEP1ar6rRyLMsU8v1Vx+Nkf8ONVAWM31mGCtSivqtKH0RBtjsGA9GOePNCn1zsYTlCG/q4qxWr41r4vAwB3XW4INkqII4kvQsk9H3R+ustMk/0nyLfNquutnHHAgbGkt8vMsql8cPCLuoCRVL/pbqNF6gI1OkDSvjuzCIGdr8crumyG0OWDCLNqGAQeavdN4u/3wKqNkjgpDVhdLGuB3F5kjZAc/mLrbuhRRuxduifnNdjvcldHEYMnKxUw/afgLc/n81yT2sZWF07pp0E8/npvWFIAvLIearndKFKuY01eninBdCzyjTe1vhTyrz982l3W96DYUXjlrfSIwCMHIL5Rj8dO/qUtJUBK5+XkpXd59+/h2Jh7MU8ZK7KtenMIyvbMYD9KusNlD2hGHjRd28rZ/S4H7wN6ih1JrCs6lN6aFML4q8hgUL1nQX20G0yC9Kf3WE7Q/ArZwX4jWizuFfxNAXm2qSE+7KzfXLsgu+7M23PTQ9LoE6Xem8yp/AOEplunLXYnpZSm7KUpYoH7zZe/tTDmuRHIbDDI8bVSjhICHTnkTNhBz5Fu0+SMxRDSgeYrP+E+M/Ht2PSjZp7TudVoBRWyscnaUXLuHfjofR+p2vJO44BlWrWv202P1S3wlORhq0Z06RNv3u4M437k1exKyojXHBmxKWJeWa0spxVC15cTjQOfNGWJ9KHq6GfQHC+Onh5Jal3ojZu7Z+9jbVGCA3ZVYrShZLhfYEEw0obvIpmWPbXwtxRC9NZke/npTMA99wEzfqv64+ven17bLC5v8BFNJKqD3ZwtQaQBhBRYj2F8t7YsQCfisivTam/hnQYyACgDx6Tkf5fX4yT2LWRoJYTXdaAhQCdZsD3HOBWUpalkw3n3iB53bcOGsbv5xkwHDvR8hd5dfNSZvpNQXrFrW3nsvdgaIYYXe2GJApgstUxiXaQEW9wbhMVmI7q2pUTS9ihm/viE2rQMU3rBr7NK/1/3tdvCf9SRz9h4Z6tblzN+ui8YG+s7q+rtVbx1tdM8Mz9gds1Lg6qN0Oq0z0yDyxWW0UB6At9DZUmVl9SuKFC8sVDOs45/VEFMxVSP+GYOmjRbFN/HY9TiT4xOAz2Yig6f+scg35g/saYVp+X1pERO2e1srELC+KX7qNiznTua7OCXuz39L0YV4n9b+KB X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1968; 6:IMxl54IY5DmkETHQn99GjO4m/KSV3yY67jsibMYLbozbYgfY04g6TWTvpbZW4CGaH4fLhVCYLq+H7YmA9aUS+ZH2u2n2YtElBbsRWU6vy2dIEHabfYfbBHHjjCjGGFFvyn32Z3FzQO0wR/vh8V5KxvtJFApf56WPIMZSoicgCRnvmyXSHyvmJLCkKZL5e+5aNooVrBUgODMjKGi0SNGZRqiFMrVfbeZOt7UKVq3cqpiALHRjGmjuw8aw4F8bdCk6xp7U+BBcpvwrwlud8/1f9VZGgXLyXmEFl+N8GOn9hNs6O/x3ZCmuBCNa38htd4EWUJgxzgjTjhtu8D6pE+IUIyeAb+n22eEIznavC7Sz+8Q=; 5:n4oz2R7mxihrq5Ot/Rux7WKjRMuZP4cp+Du/DzYeuM0S/2YhY6p0rn5B8wvbApmhgGV+WnfJxGz+CnldA5g02y5UWKPuAGdRntato/SFhMbV67TMdjHnkS+jVPg7TVGTbjy9z3jx3Fb6KhuGtwzkc7j5FUMApQ3ZjPCqa6H1gs4=; 24:smz6f18IaKDQsBkVcFLau9ui2iPa8LweTmCAVU84NRVyQq8u7x1hYXd0nWV6QaPEoEvRoWfbQB9o5CetQ9KdNYRmU4tSyfA9mhxSx02mtNo=; 7:I3CQZYP17IM8vQ1JChoS7TzHXKGcFS2XwhEFtTKSMpR9sb28akCZgN6LkpSPiJOUpARnMp1Ae49mLcfQmbdmL4h+PmPPQvlRP2X7OLZf8HfBxCnO8JzsMGVW3FCm9EOhvMMrBl/sj2d5o1f9cI9NTxSawipWu+qOLrMDymjRw68So47nBK8/SMtnM4tntiUXqq3JWONQ7lUb1yGR4yX80GGjgFcJch2a/eEPi7jkCoFxILNZO3u2PeiCz4H9x3W8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 10:52:59.9361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14c697f1-08e6-4302-e90e-08d559aaa664 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0701MB1968 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org aq_nic_s was hidden in aq_nic_internal.h, that made it difficult to access nic fields and structures from other modules. This change moves aq_nic_s struct into aq_nic.h and thus makes it available to other driver modules, mainly pci module and hw related module. Signed-off-by: Igor Russkikh --- drivers/net/ethernet/aquantia/atlantic/aq_common.h | 1 - drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 8 ++++ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 - drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 6 --- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 34 +++++++++++++++- .../ethernet/aquantia/atlantic/aq_nic_internal.h | 45 ---------------------- drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 2 + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 1 + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 1 + 10 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_common.h b/drivers/net/ethernet/aquantia/atlantic/aq_common.h index fe1c16b..d52b088 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_common.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_common.h @@ -16,7 +16,6 @@ #include #include "ver.h" -#include "aq_nic.h" #include "aq_cfg.h" #include "aq_utils.h" diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h index dce9b6d..5792a7c 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h @@ -15,6 +15,7 @@ #define AQ_HW_H #include "aq_common.h" +#include "aq_rss.h" #include "hw_atl/hw_atl_utils.h" /* NIC H/W capabilities */ @@ -88,6 +89,13 @@ struct aq_stats_s { #define AQ_HW_FLAG_ERRORS (AQ_HW_FLAG_ERR_HW | AQ_HW_FLAG_ERR_UNPLUG) +#define AQ_NIC_FLAGS_IS_NOT_READY (AQ_NIC_FLAG_STOPPING | \ + AQ_NIC_FLAG_RESETTING | AQ_NIC_FLAG_CLOSING | \ + AQ_NIC_FLAG_ERR_UNPLUG | AQ_NIC_FLAG_ERR_HW) + +#define AQ_NIC_FLAGS_IS_NOT_TX_READY (AQ_NIC_FLAGS_IS_NOT_READY | \ + AQ_NIC_LINK_DOWN) + #define AQ_HW_MEDIA_TYPE_TP 1U #define AQ_HW_MEDIA_TYPE_FIBRE 2U diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index c2c1eb5..887bc84 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -11,7 +11,6 @@ #include "aq_main.h" #include "aq_nic.h" -#include "aq_nic_internal.h" #include "aq_pci_func.h" #include "aq_ethtool.h" diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 0615d43..b6d9ef1 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -14,7 +14,6 @@ #include "aq_vec.h" #include "aq_hw.h" #include "aq_pci_func.h" -#include "aq_nic_internal.h" #include "aq_main.h" #include @@ -355,11 +354,6 @@ void aq_nic_set_tx_ring(struct aq_nic_s *self, unsigned int idx, self->aq_ring_tx[idx] = ring; } -struct device *aq_nic_get_dev(struct aq_nic_s *self) -{ - return self->ndev->dev.parent; -} - struct net_device *aq_nic_get_ndev(struct aq_nic_s *self) { return self->ndev; diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h index 01708aa..a49212a 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h @@ -19,6 +19,8 @@ struct aq_ring_s; struct aq_pci_func_s; struct aq_hw_ops; +struct aq_fw_s; +struct aq_vec_s; struct aq_nic_cfg_s { const struct aq_hw_caps_s *aq_hw_caps; @@ -32,7 +34,6 @@ struct aq_nic_cfg_s { u16 tx_itr; u32 num_rss_queues; u32 mtu; - u32 ucp_0x364; u32 flow_control; u32 link_speed_msk; u32 vlan_id; @@ -57,6 +58,37 @@ struct aq_nic_cfg_s { #define AQ_NIC_TCVEC2RING(_NIC_, _TC_, _VEC_) \ ((_TC_) * AQ_CFG_TCS_MAX + (_VEC_)) +struct aq_nic_s { + atomic_t flags; + struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX]; + struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX]; + struct aq_hw_s *aq_hw; + struct net_device *ndev; + struct aq_pci_func_s *aq_pci_func; + unsigned int aq_vecs; + unsigned int packet_filter; + unsigned int power_state; + u8 port; + struct aq_hw_ops aq_hw_ops; + struct aq_hw_caps_s aq_hw_caps; + struct aq_nic_cfg_s aq_nic_cfg; + struct timer_list service_timer; + struct timer_list polling_timer; + struct aq_hw_link_status_s link_status; + struct { + u32 count; + u8 ar[AQ_CFG_MULTICAST_ADDRESS_MAX][ETH_ALEN]; + } mc_list; + + struct pci_dev *pdev; + unsigned int msix_entry_mask; +}; + +static inline struct device *aq_nic_get_dev(struct aq_nic_s *self) +{ + return self->ndev->dev.parent; +} + struct aq_nic_s *aq_nic_alloc_cold(struct pci_dev *pdev, struct aq_pci_func_s *aq_pci_func, unsigned int port, diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h deleted file mode 100644 index 265211c..0000000 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * aQuantia Corporation Network Driver - * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - */ - -/* File aq_nic_internal.h: Definition of private object structure. */ - -#ifndef AQ_NIC_INTERNAL_H -#define AQ_NIC_INTERNAL_H - -struct aq_nic_s { - atomic_t flags; - struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX]; - struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX]; - struct aq_hw_s *aq_hw; - struct net_device *ndev; - struct aq_pci_func_s *aq_pci_func; - unsigned int aq_vecs; - unsigned int packet_filter; - unsigned int power_state; - u8 port; - struct aq_hw_ops aq_hw_ops; - struct aq_hw_caps_s aq_hw_caps; - struct aq_nic_cfg_s aq_nic_cfg; - struct timer_list service_timer; - struct timer_list polling_timer; - struct aq_hw_link_status_s link_status; - struct { - u32 count; - u8 ar[AQ_CFG_MULTICAST_ADDRESS_MAX][ETH_ALEN]; - } mc_list; -}; - -#define AQ_NIC_FLAGS_IS_NOT_READY (AQ_NIC_FLAG_STOPPING | \ - AQ_NIC_FLAG_RESETTING | AQ_NIC_FLAG_CLOSING | \ - AQ_NIC_FLAG_ERR_UNPLUG | AQ_NIC_FLAG_ERR_HW) - -#define AQ_NIC_FLAGS_IS_NOT_TX_READY (AQ_NIC_FLAGS_IS_NOT_READY | \ - AQ_NIC_LINK_DOWN) - -#endif /* AQ_NIC_INTERNAL_H */ diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h index 2b051fd..965fae0 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h @@ -15,6 +15,7 @@ #include "aq_common.h" struct page; +struct aq_nic_cfg_s; /* TxC SOP DX EOP * +----------+----------+----------+----------- diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.h b/drivers/net/ethernet/aquantia/atlantic/aq_vec.h index 78cc6c3..8bdf60b 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.h @@ -19,6 +19,8 @@ struct aq_hw_s; struct aq_hw_ops; +struct aq_nic_s; +struct aq_nic_cfg_s; struct aq_ring_stats_rx_s; struct aq_ring_stats_tx_s; diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c index 149721a..523214b 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c @@ -12,6 +12,7 @@ #include "../aq_hw.h" #include "../aq_hw_utils.h" #include "../aq_ring.h" +#include "../aq_nic.h" #include "hw_atl_a0.h" #include "hw_atl_utils.h" #include "hw_atl_llh.h" diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index b124ac5..8ef7c98 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -12,6 +12,7 @@ #include "../aq_hw.h" #include "../aq_hw_utils.h" #include "../aq_ring.h" +#include "../aq_nic.h" #include "hw_atl_b0.h" #include "hw_atl_utils.h" #include "hw_atl_llh.h"