提交 c2aee6ed 编写于 作者: P Peng Li 提交者: Yang Yingliang

net: hns3: remove unused parameter from hclge_set_vf_vlan_common()

mainline inclusion
from mainline-v5.13-rc1
commit 567d1dd3
category: feature
bugzilla: NA
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=567d1dd3e4bc204e424553ccf2e1d47b0f5d03a8

----------------------------------------------------------------------

Parameter vf in hclge_set_vf_vlan_common() is unused now,
so remove it.
Signed-off-by: NPeng Li <lipeng321@huawei.com>
Signed-off-by: NHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Reviewed-by: NYongxin Li <liyongxin1@huawei.com>
Signed-off-by: NJunxin Chen <chenjunxin1@huawei.com>
Reviewed-by: NJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 7d2c54d8
...@@ -8431,8 +8431,7 @@ static int hclge_enable_vlan_filter(struct hnae3_handle *handle, bool enable) ...@@ -8431,8 +8431,7 @@ static int hclge_enable_vlan_filter(struct hnae3_handle *handle, bool enable)
} }
static int hclge_set_vf_vlan_common(struct hclge_dev *hdev, u16 vfid, static int hclge_set_vf_vlan_common(struct hclge_dev *hdev, u16 vfid,
bool is_kill, u16 vlan, bool is_kill, u16 vlan)
__be16 proto)
{ {
struct hclge_vport *vport = &hdev->vport[vfid]; struct hclge_vport *vport = &hdev->vport[vfid];
struct hclge_vlan_filter_vf_cfg_cmd *req0; struct hclge_vlan_filter_vf_cfg_cmd *req0;
...@@ -8563,8 +8562,7 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto, ...@@ -8563,8 +8562,7 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,
if (vlan_id >= VLAN_N_VID) if (vlan_id >= VLAN_N_VID)
return -EINVAL; return -EINVAL;
ret = hclge_set_vf_vlan_common(hdev, vport_id, is_kill, vlan_id, ret = hclge_set_vf_vlan_common(hdev, vport_id, is_kill, vlan_id);
proto);
if (ret) { if (ret) {
dev_err(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"Set %u vport vlan filter config fail, ret =%d.\n", "Set %u vport vlan filter config fail, ret =%d.\n",
...@@ -9104,8 +9102,7 @@ static int hclge_update_vlan_filter_entries(struct hclge_vport *vport, ...@@ -9104,8 +9102,7 @@ static int hclge_update_vlan_filter_entries(struct hclge_vport *vport,
vport->port_base_vlan_cfg.tbl_sta = false; vport->port_base_vlan_cfg.tbl_sta = false;
/* force add vlan 0 */ /* force add vlan 0 */
ret = hclge_set_vf_vlan_common(hdev, vport->vport_id, false, 0, ret = hclge_set_vf_vlan_common(hdev, vport->vport_id, false, 0);
htons(ETH_P_8021Q));
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册