diff options
| author | Igor Russkikh <igor.russkikh@aquantia.com> | 2018-01-19 17:03:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-21 18:19:03 -0500 |
| commit | efe779b749cc9da0f36a01fba38c98864e6b8748 (patch) | |
| tree | 46ef73be36bf408fc756cf25df4465f88c4a067e /drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | |
| parent | f9b6ae29ae738c8ed06b8a869628b1d98d8e7624 (diff) | |
net: aquantia: Introduce new device ids and constants
New set of aquantia devices has an upgraded hardware (B1).
The hardware interface is identical to B0. The difference will
be in firmware which is incompatible with old one.
Reorganized and removed duplicate speed and devid definitions
Introduced explicit flow control configuration defines
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 20 |
1 files changed, 10 insertions, 10 deletions
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 0b090161ed79..edb9823e36e5 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 @@ -26,12 +26,12 @@ static int hw_atl_b0_get_hw_caps(struct aq_hw_s *self, { memcpy(aq_hw_caps, &hw_atl_b0_hw_caps_, sizeof(*aq_hw_caps)); - if (device == HW_ATL_DEVICE_ID_D108 && subsystem_device == 0x0001) - aq_hw_caps->link_speed_msk &= ~HW_ATL_B0_RATE_10G; + if (device == AQ_DEVICE_ID_D108 && subsystem_device == 0x0001) + aq_hw_caps->link_speed_msk &= ~AQ_NIC_RATE_10G; - if (device == HW_ATL_DEVICE_ID_D109 && subsystem_device == 0x0001) { - aq_hw_caps->link_speed_msk &= ~HW_ATL_B0_RATE_10G; - aq_hw_caps->link_speed_msk &= ~HW_ATL_B0_RATE_5G; + if (device == AQ_DEVICE_ID_D109 && subsystem_device == 0x0001) { + aq_hw_caps->link_speed_msk &= ~AQ_NIC_RATE_10G; + aq_hw_caps->link_speed_msk &= ~AQ_NIC_RATE_5G; } return 0; @@ -981,11 +981,11 @@ static const struct aq_hw_ops hw_atl_ops_ = { const struct aq_hw_ops *hw_atl_b0_get_ops_by_id(struct pci_dev *pdev) { bool is_vid_ok = (pdev->vendor == PCI_VENDOR_ID_AQUANTIA); - bool is_did_ok = ((pdev->device == HW_ATL_DEVICE_ID_0001) || - (pdev->device == HW_ATL_DEVICE_ID_D100) || - (pdev->device == HW_ATL_DEVICE_ID_D107) || - (pdev->device == HW_ATL_DEVICE_ID_D108) || - (pdev->device == HW_ATL_DEVICE_ID_D109)); + bool is_did_ok = ((pdev->device == AQ_DEVICE_ID_0001) || + (pdev->device == AQ_DEVICE_ID_D100) || + (pdev->device == AQ_DEVICE_ID_D107) || + (pdev->device == AQ_DEVICE_ID_D108) || + (pdev->device == AQ_DEVICE_ID_D109)); bool is_rev_ok = (pdev->revision == 2U); |