net: hns3: Remove the default mask configuration for mac vlan table

The default mask configuration has been done by firmware, so the driver
doesn't need to do it any more.

Signed-off-by: Zhongzhu Liu <liuzhongzhu@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
index e5e66b27e03eec096389a8fdf698cd66e2910262..26fda05537703469a0bda671185800a477301568 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
@@ -177,7 +177,6 @@ enum hclge_opcode_type {
        HCLGE_OPC_MAC_VLAN_INSERT           = 0x1003,
        HCLGE_OPC_MAC_ETHTYPE_ADD           = 0x1010,
        HCLGE_OPC_MAC_ETHTYPE_REMOVE    = 0x1011,
-       HCLGE_OPC_MAC_VLAN_MASK_SET     = 0x1012,
 
        /* Multicast linear table commands */
        HCLGE_OPC_MTA_MAC_MODE_CFG          = 0x1020,
@@ -591,15 +590,6 @@ struct hclge_mac_vlan_tbl_entry_cmd {
        u8      rsv2[6];
 };
 
-#define HCLGE_VLAN_MASK_EN_B           0
-struct hclge_mac_vlan_mask_entry_cmd {
-       u8 rsv0[2];
-       u8 vlan_mask;
-       u8 rsv1;
-       u8 mac_mask[6];
-       u8 rsv2[14];
-};
-
 #define HCLGE_MAC_MGR_MASK_VLAN_B              BIT(0)
 #define HCLGE_MAC_MGR_MASK_MAC_B               BIT(1)
 #define HCLGE_MAC_MGR_MASK_ETHERTYPE_B         BIT(2)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 21ca4af3b37aded0024d21b323cb16293fe04a82..0106c1b37e127841214b34505e1258997ee8958f 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1939,36 +1939,11 @@ static int hclge_get_autoneg(struct hnae3_handle *handle)
        return hdev->hw.mac.autoneg;
 }
 
-static int hclge_set_default_mac_vlan_mask(struct hclge_dev *hdev,
-                                          bool mask_vlan,
-                                          u8 *mac_mask)
-{
-       struct hclge_mac_vlan_mask_entry_cmd *req;
-       struct hclge_desc desc;
-       int status;
-
-       req = (struct hclge_mac_vlan_mask_entry_cmd *)desc.data;
-       hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MAC_VLAN_MASK_SET, false);
-
-       hnae3_set_bit(req->vlan_mask, HCLGE_VLAN_MASK_EN_B,
-                     mask_vlan ? 1 : 0);
-       ether_addr_copy(req->mac_mask, mac_mask);
-
-       status = hclge_cmd_send(&hdev->hw, &desc, 1);
-       if (status)
-               dev_err(&hdev->pdev->dev,
-                       "Config mac_vlan_mask failed for cmd_send, ret =%d\n",
-                       status);
-
-       return status;
-}
-
 static int hclge_mac_init(struct hclge_dev *hdev)
 {
        struct hnae3_handle *handle = &hdev->vport[0].nic;
        struct net_device *netdev = handle->kinfo.netdev;
        struct hclge_mac *mac = &hdev->hw.mac;
-       u8 mac_mask[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
        struct hclge_vport *vport;
        int mtu;
        int ret;
@@ -2011,13 +1986,6 @@ static int hclge_mac_init(struct hclge_dev *hdev)
                }
        }
 
-       ret = hclge_set_default_mac_vlan_mask(hdev, true, mac_mask);
-       if (ret) {
-               dev_err(&hdev->pdev->dev,
-                       "set default mac_vlan_mask fail ret=%d\n", ret);
-               return ret;
-       }
-
        if (netdev)
                mtu = netdev->mtu;
        else