diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
commit | 644bca1d48139ad77570c24d22bafaf8e438cf03 (patch) | |
tree | 37db3b2976c7d4f1c4541fe6946582d242a405a2 /drivers/net/ethernet/aquantia | |
parent | 93e0401e0fc0c54b0ac05b687cd135c2ac38187c (diff) | |
parent | cb9e6e584d58420df182102674e636fb841dae4c (diff) | |
download | linux-stable-644bca1d48139ad77570c24d22bafaf8e438cf03.tar.gz linux-stable-644bca1d48139ad77570c24d22bafaf8e438cf03.tar.bz2 linux-stable-644bca1d48139ad77570c24d22bafaf8e438cf03.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
There's a fix which landed in net-next, pull it in along
with the couple of minor cleanups.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/aquantia')
-rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c index 58d426dda3ed..674683b54304 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c @@ -336,7 +336,7 @@ static int aq_a2_fw_get_mac_permanent(struct aq_hw_s *self, u8 *mac) static void aq_a2_fill_a0_stats(struct aq_hw_s *self, struct statistics_s *stats) { - struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; + struct hw_atl2_priv *priv = self->priv; struct aq_stats_s *cs = &self->curr_stats; struct aq_stats_s curr_stats = *cs; bool corrupted_stats = false; @@ -378,7 +378,7 @@ do { \ static void aq_a2_fill_b0_stats(struct aq_hw_s *self, struct statistics_s *stats) { - struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; + struct hw_atl2_priv *priv = self->priv; struct aq_stats_s *cs = &self->curr_stats; struct aq_stats_s curr_stats = *cs; bool corrupted_stats = false; |