diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-05-09 11:48:02 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-05-09 11:48:02 -0700 |
| commit | 2c674bec76d35b75c7c730f863424387c9e9633a (patch) | |
| tree | fa4de5589f90228f431513a5daab93e2798e067d /drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | |
| parent | 5eb2bcf247de02b92749fe6a6b342f6393ca3f86 (diff) | |
| parent | b4de6c49e569c7ca91bf0d4c25cdb6eeca9c9529 (diff) | |
| download | linux-2c674bec76d35b75c7c730f863424387c9e9633a.tar.bz2 | |
Merge branch 'net-atlantic-driver-updates'
Mark Starovoytov says:
====================
net: atlantic: driver updates
This patch series contains several minor cleanups for the previously
submitted series.
We also add Marvell copyrights on newly touched files.
v2:
* accommodated review comments related to the last patch in series
(MAC generation)
v1: https://patchwork.ozlabs.org/cover/1285011/
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c index 04d194f754fa..6f2b33ae3d06 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c @@ -60,7 +60,7 @@ const struct aq_hw_caps_s hw_atl2_caps_aqc113 = { .media_type = AQ_HW_MEDIA_TYPE_TP, .link_speed_msk = AQ_NIC_RATE_10G | AQ_NIC_RATE_5G | - AQ_NIC_RATE_2GS | + AQ_NIC_RATE_2G5 | AQ_NIC_RATE_1G | AQ_NIC_RATE_100M | AQ_NIC_RATE_10M, @@ -172,7 +172,7 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self, for (i = HW_ATL2_RSS_REDIRECTION_MAX; i--;) hw_atl2_new_rpf_rss_redir_set(self, 0, i, indirection_table[i]); - return hw_atl_b0_hw_rss_set(self, rss_params); + return aq_hw_err_from_flags(self); } static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self) |