Commit dd2b6ef9 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller

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: default avatarZhongzhu Liu <liuzhongzhu@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 226407dd
...@@ -177,7 +177,6 @@ enum hclge_opcode_type { ...@@ -177,7 +177,6 @@ enum hclge_opcode_type {
HCLGE_OPC_MAC_VLAN_INSERT = 0x1003, HCLGE_OPC_MAC_VLAN_INSERT = 0x1003,
HCLGE_OPC_MAC_ETHTYPE_ADD = 0x1010, HCLGE_OPC_MAC_ETHTYPE_ADD = 0x1010,
HCLGE_OPC_MAC_ETHTYPE_REMOVE = 0x1011, HCLGE_OPC_MAC_ETHTYPE_REMOVE = 0x1011,
HCLGE_OPC_MAC_VLAN_MASK_SET = 0x1012,
/* Multicast linear table commands */ /* Multicast linear table commands */
HCLGE_OPC_MTA_MAC_MODE_CFG = 0x1020, HCLGE_OPC_MTA_MAC_MODE_CFG = 0x1020,
...@@ -591,15 +590,6 @@ struct hclge_mac_vlan_tbl_entry_cmd { ...@@ -591,15 +590,6 @@ struct hclge_mac_vlan_tbl_entry_cmd {
u8 rsv2[6]; 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_VLAN_B BIT(0)
#define HCLGE_MAC_MGR_MASK_MAC_B BIT(1) #define HCLGE_MAC_MGR_MASK_MAC_B BIT(1)
#define HCLGE_MAC_MGR_MASK_ETHERTYPE_B BIT(2) #define HCLGE_MAC_MGR_MASK_ETHERTYPE_B BIT(2)
......
...@@ -1939,36 +1939,11 @@ static int hclge_get_autoneg(struct hnae3_handle *handle) ...@@ -1939,36 +1939,11 @@ static int hclge_get_autoneg(struct hnae3_handle *handle)
return hdev->hw.mac.autoneg; 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) static int hclge_mac_init(struct hclge_dev *hdev)
{ {
struct hnae3_handle *handle = &hdev->vport[0].nic; struct hnae3_handle *handle = &hdev->vport[0].nic;
struct net_device *netdev = handle->kinfo.netdev; struct net_device *netdev = handle->kinfo.netdev;
struct hclge_mac *mac = &hdev->hw.mac; struct hclge_mac *mac = &hdev->hw.mac;
u8 mac_mask[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
struct hclge_vport *vport; struct hclge_vport *vport;
int mtu; int mtu;
int ret; int ret;
...@@ -2011,13 +1986,6 @@ static int hclge_mac_init(struct hclge_dev *hdev) ...@@ -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) if (netdev)
mtu = netdev->mtu; mtu = netdev->mtu;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment