From: Guangbin Huang <huangguangbin2@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <wangjie125@huawei.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<lipeng321@huawei.com>, <huangguangbin2@huawei.com>,
<chenhao288@hisilicon.com>
Subject: [PATCH net-next 02/11] net: hns3: refactor function hclge_set_vlan_filter_hw
Date: Fri, 3 Dec 2021 17:20:50 +0800 [thread overview]
Message-ID: <20211203092059.24947-3-huangguangbin2@huawei.com> (raw)
In-Reply-To: <20211203092059.24947-1-huangguangbin2@huawei.com>
Function hclge_set_vlan_filter_hw() is a bit too long, so add a new
function hclge_need_update_port_vlan() to simplify code and improve
code readability.
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
.../hisilicon/hns3/hns3pf/hclge_main.c | 45 +++++++++++--------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 5a5e74dfd0be..0d2ed05c4f50 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -10005,6 +10005,32 @@ static int hclge_set_port_vlan_filter(struct hclge_dev *hdev, __be16 proto,
return ret;
}
+static bool hclge_need_update_port_vlan(struct hclge_dev *hdev, u16 vport_id,
+ u16 vlan_id, bool is_kill)
+{
+ /* vlan 0 may be added twice when 8021q module is enabled */
+ if (!is_kill && !vlan_id &&
+ test_bit(vport_id, hdev->vlan_table[vlan_id]))
+ return false;
+
+ if (!is_kill && test_and_set_bit(vport_id, hdev->vlan_table[vlan_id])) {
+ dev_warn(&hdev->pdev->dev,
+ "Add port vlan failed, vport %u is already in vlan %u\n",
+ vport_id, vlan_id);
+ return false;
+ }
+
+ if (is_kill &&
+ !test_and_clear_bit(vport_id, hdev->vlan_table[vlan_id])) {
+ dev_warn(&hdev->pdev->dev,
+ "Delete port vlan failed, vport %u is not in vlan %u\n",
+ vport_id, vlan_id);
+ return false;
+ }
+
+ return true;
+}
+
static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,
u16 vport_id, u16 vlan_id,
bool is_kill)
@@ -10026,26 +10052,9 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,
return ret;
}
- /* vlan 0 may be added twice when 8021q module is enabled */
- if (!is_kill && !vlan_id &&
- test_bit(vport_id, hdev->vlan_table[vlan_id]))
+ if (!hclge_need_update_port_vlan(hdev, vport_id, vlan_id, is_kill))
return 0;
- if (!is_kill && test_and_set_bit(vport_id, hdev->vlan_table[vlan_id])) {
- dev_err(&hdev->pdev->dev,
- "Add port vlan failed, vport %u is already in vlan %u\n",
- vport_id, vlan_id);
- return -EINVAL;
- }
-
- if (is_kill &&
- !test_and_clear_bit(vport_id, hdev->vlan_table[vlan_id])) {
- dev_err(&hdev->pdev->dev,
- "Delete port vlan failed, vport %u is not in vlan %u\n",
- vport_id, vlan_id);
- return -EINVAL;
- }
-
for_each_set_bit(vport_idx, hdev->vlan_table[vlan_id], HCLGE_VPORT_NUM)
vport_num++;
--
2.33.0
next prev parent reply other threads:[~2021-12-03 9:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 9:20 [PATCH net-next 00/11] net: hns3: some cleanups for -next Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 01/11] net: hns3: optimize function hclge_cfg_common_loopback() Guangbin Huang
2021-12-03 9:20 ` Guangbin Huang [this message]
2021-12-03 9:20 ` [PATCH net-next 03/11] net: hns3: add print vport id for failed message of vlan Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 04/11] net: hns3: Align type of some variables with their print type Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 05/11] net: hns3: modify one argument type of function hclge_ncl_config_data_print Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 06/11] net: hns3: align return value type of atomic_read() with its output Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 07/11] net: hns3: add void before function which don't receive ret Guangbin Huang
2021-12-03 11:15 ` Leon Romanovsky
2021-12-03 11:27 ` huangguangbin (A)
2021-12-03 9:20 ` [PATCH net-next 08/11] net: hns3: add comments for hclge_dbg_fill_content() Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 09/11] net: hns3: remove rebundant line for hclge_dbg_dump_tm_pg() Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 10/11] net: hns3: replace one tab with space in for statement Guangbin Huang
2021-12-03 9:20 ` [PATCH net-next 11/11] net: hns3: fix hns3 driver header file not self-contained issue Guangbin Huang
2021-12-03 11:20 ` [PATCH net-next 00/11] net: hns3: some cleanups for -next patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211203092059.24947-3-huangguangbin2@huawei.com \
--to=huangguangbin2@huawei.com \
--cc=chenhao288@hisilicon.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=wangjie125@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.