Revert "UBUNTU: SAUCE: {topost} net: hns3: remove some redundant assignments"

BugLink: https://bugs.launchpad.net/bugs/1787477
This reverts commit 60d7d474ce0cd9bf1366cce4145ad770f7d544c2.
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index 054a9136270acacc8d87e8cd3075e5ffdb523ca6..969966c8d9ef331b47c7767c9cf7728f26b334f6 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -110,6 +110,8 @@ void hclge_cmd_setup_basic_desc(struct hclge_desc *desc,
 
        if (is_read)
                desc->flag |= cpu_to_le16(HCLGE_CMD_FLAG_WR);
+       else
+               desc->flag &= cpu_to_le16(~HCLGE_CMD_FLAG_WR);
 }
 
 static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index d429c89f3bbc7cf450fc267f391777f42f0dc549..29c95c8235163d428c33cc2c50ae1686d27ad625 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2745,6 +2745,7 @@ int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id)
        int ret;
 
        hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CFG_RST_TRIGGER, false);
+       hnae_set_bit(req->mac_func_reset, HCLGE_CFG_RESET_MAC_B, 0);
        hnae_set_bit(req->mac_func_reset, HCLGE_CFG_RESET_FUNC_B, 1);
        req->fun_reset_vfid = func_id;
 
@@ -4327,9 +4328,16 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport,
 
        memset(&req, 0, sizeof(req));
        hnae_set_bit(req.flags, HCLGE_MAC_VLAN_BIT0_EN_B, 1);
+       hnae_set_bit(req.entry_type, HCLGE_MAC_VLAN_BIT0_EN_B, 0);
+       hnae_set_bit(req.entry_type, HCLGE_MAC_VLAN_BIT1_EN_B, 0);
+       hnae_set_bit(req.mc_mac_en, HCLGE_MAC_VLAN_BIT0_EN_B, 0);
 
+       hnae_set_bit(egress_port, HCLGE_MAC_EPORT_SW_EN_B, 0);
+       hnae_set_bit(egress_port, HCLGE_MAC_EPORT_TYPE_B, 0);
        hnae_set_field(egress_port, HCLGE_MAC_EPORT_VFID_M,
                       HCLGE_MAC_EPORT_VFID_S, vport->vport_id);
+       hnae_set_field(egress_port, HCLGE_MAC_EPORT_PFID_M,
+                      HCLGE_MAC_EPORT_PFID_S, 0);
 
        req.egress_port = cpu_to_le16(egress_port);