You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
109 lines
4.0 KiB
109 lines
4.0 KiB
From 4ec7dbfa26afe3372c14fb1e5912da447637dd18 Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:38:30 -0500
|
|
Subject: [PATCH 133/139] [netdrv] net: atlantic: use intermediate variable to
|
|
improve readability a bit
|
|
|
|
Message-id: <1604687916-15087-134-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338562
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 133/139] net: atlantic: use intermediate variable to improve readability a bit
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit b98ffe6fa415a6ea5cbc7e8d58dd016e83fe33ea
|
|
Author: Nikita Danilov <ndanilov@marvell.com>
|
|
Date: Mon Jul 20 21:32:42 2020 +0300
|
|
|
|
net: atlantic: use intermediate variable to improve readability a bit
|
|
|
|
This patch syncs up hw_atl_a0.c with an out-of-tree driver, where an
|
|
intermediate variable was introduced in a couple of functions to
|
|
improve the code readability a bit.
|
|
|
|
Signed-off-by: Nikita Danilov <ndanilov@marvell.com>
|
|
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
|
|
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
.../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 21 ++++++++++-----------
|
|
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
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 8f8b90436ced..e1877d520135 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
|
|
@@ -752,6 +752,7 @@ static int hw_atl_a0_hw_irq_read(struct aq_hw_s *self, u64 *mask)
|
|
static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,
|
|
unsigned int packet_filter)
|
|
{
|
|
+ struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
|
|
unsigned int i = 0U;
|
|
|
|
hw_atl_rpfl2promiscuous_mode_en_set(self,
|
|
@@ -760,14 +761,13 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,
|
|
IS_FILTER_ENABLED(IFF_MULTICAST), 0);
|
|
hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST));
|
|
|
|
- self->aq_nic_cfg->is_mc_list_enabled =
|
|
- IS_FILTER_ENABLED(IFF_MULTICAST);
|
|
+ cfg->is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST);
|
|
|
|
for (i = HW_ATL_A0_MAC_MIN; i < HW_ATL_A0_MAC_MAX; ++i)
|
|
hw_atl_rpfl2_uc_flr_en_set(self,
|
|
- (self->aq_nic_cfg->is_mc_list_enabled &&
|
|
- (i <= self->aq_nic_cfg->mc_list_count)) ?
|
|
- 1U : 0U, i);
|
|
+ (cfg->is_mc_list_enabled &&
|
|
+ (i <= cfg->mc_list_count)) ? 1U : 0U,
|
|
+ i);
|
|
|
|
return aq_hw_err_from_flags(self);
|
|
}
|
|
@@ -780,19 +780,18 @@ static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,
|
|
[ETH_ALEN],
|
|
u32 count)
|
|
{
|
|
+ struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
|
|
int err = 0;
|
|
|
|
if (count > (HW_ATL_A0_MAC_MAX - HW_ATL_A0_MAC_MIN)) {
|
|
err = EBADRQC;
|
|
goto err_exit;
|
|
}
|
|
- for (self->aq_nic_cfg->mc_list_count = 0U;
|
|
- self->aq_nic_cfg->mc_list_count < count;
|
|
- ++self->aq_nic_cfg->mc_list_count) {
|
|
- u32 i = self->aq_nic_cfg->mc_list_count;
|
|
+ for (cfg->mc_list_count = 0U; cfg->mc_list_count < count; ++cfg->mc_list_count) {
|
|
+ u32 i = cfg->mc_list_count;
|
|
u32 h = (ar_mac[i][0] << 8) | (ar_mac[i][1]);
|
|
u32 l = (ar_mac[i][2] << 24) | (ar_mac[i][3] << 16) |
|
|
- (ar_mac[i][4] << 8) | ar_mac[i][5];
|
|
+ (ar_mac[i][4] << 8) | ar_mac[i][5];
|
|
|
|
hw_atl_rpfl2_uc_flr_en_set(self, 0U, HW_ATL_A0_MAC_MIN + i);
|
|
|
|
@@ -805,7 +804,7 @@ static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,
|
|
HW_ATL_A0_MAC_MIN + i);
|
|
|
|
hw_atl_rpfl2_uc_flr_en_set(self,
|
|
- (self->aq_nic_cfg->is_mc_list_enabled),
|
|
+ (cfg->is_mc_list_enabled),
|
|
HW_ATL_A0_MAC_MIN + i);
|
|
}
|
|
|
|
--
|
|
2.13.6
|
|
|