Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 040a3800 authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller
Browse files

net: hns: Remove the redundant adding and deleting mac function 



The functions (hns_dsaf_set_mac_mc_entry() and hns_mac_del_mac()) are
not called by any functions. They are dead code in hns. And the same
features are implemented by the patch (the id is 66355f52).

Reported-by: default avatarWeiwei Deng <dengweiwei@huawei.com>
Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Reviewed-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64ec10dc

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+0 −38
Original line number Diff line number Diff line
@@ -332,44 +332,6 @@ int hns_mac_set_multi(struct hns_mac_cb *mac_cb, 
	return 0;

}



/**

 *hns_mac_del_mac - delete mac address into dsaf table,can't delete the same

 *                  address twice

 *@net_dev: net device

 *@vfn :   vf lan

 *@mac : mac address

 *return status

 */

int hns_mac_del_mac(struct hns_mac_cb *mac_cb, u32 vfn, char *mac)

{

	struct mac_entry_idx *old_mac;

	struct dsaf_device *dsaf_dev;

	u32 ret;



	dsaf_dev = mac_cb->dsaf_dev;



	if (vfn < DSAF_MAX_VM_NUM) {

		old_mac = &mac_cb->addr_entry_idx[vfn];

	} else {

		dev_err(mac_cb->dev,

			"vf queue is too large, %s mac%d queue = %#x!\n",

			mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id, vfn);

		return -EINVAL;

	}



	if (dsaf_dev) {

		ret = hns_dsaf_del_mac_entry(dsaf_dev, old_mac->vlan_id,

					     mac_cb->mac_id, old_mac->addr);

		if (ret)

			return ret;



		if (memcmp(old_mac->addr, mac, sizeof(old_mac->addr)) == 0)

			old_mac->valid = 0;

	}



	return 0;

}



int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn)

{

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ int hns_mac_set_multi(struct hns_mac_cb *mac_cb, 
int hns_mac_vm_config_bc_en(struct hns_mac_cb *mac_cb, u32 vm, bool enable);

void hns_mac_start(struct hns_mac_cb *mac_cb);

void hns_mac_stop(struct hns_mac_cb *mac_cb);

int hns_mac_del_mac(struct hns_mac_cb *mac_cb, u32 vfn, char *mac);

void hns_mac_uninit(struct dsaf_device *dsaf_dev);

void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex);

void hns_mac_reset(struct hns_mac_cb *mac_cb);

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

+0 −81
Original line number Diff line number Diff line
@@ -1647,87 +1647,6 @@ int hns_dsaf_rm_mac_addr( 
				      mac_entry->addr);

}



/**

 * hns_dsaf_set_mac_mc_entry - set mac mc-entry

 * @dsaf_dev: dsa fabric device struct pointer

 * @mac_entry: mc-mac entry

 */

int hns_dsaf_set_mac_mc_entry(

	struct dsaf_device *dsaf_dev,

	struct dsaf_drv_mac_multi_dest_entry *mac_entry)

{

	u16 entry_index = DSAF_INVALID_ENTRY_IDX;

	struct dsaf_drv_tbl_tcam_key mac_key;

	struct dsaf_tbl_tcam_mcast_cfg mac_data;

	struct dsaf_drv_priv *priv =

	    (struct dsaf_drv_priv *)hns_dsaf_dev_priv(dsaf_dev);

	struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;

	struct dsaf_drv_tbl_tcam_key tmp_mac_key;

	struct dsaf_tbl_tcam_data tcam_data;



	/* mac addr check */

	if (MAC_IS_ALL_ZEROS(mac_entry->addr)) {

		dev_err(dsaf_dev->dev, "set uc %s Mac %pM err!\n",

			dsaf_dev->ae_dev.name, mac_entry->addr);

		return -EINVAL;

	}



	/*config key */

	hns_dsaf_set_mac_key(dsaf_dev, &mac_key,

			     mac_entry->in_vlan_id,

			     mac_entry->in_port_num, mac_entry->addr);



	/* entry ie exist? */

	entry_index = hns_dsaf_find_soft_mac_entry(dsaf_dev, &mac_key);

	if (entry_index == DSAF_INVALID_ENTRY_IDX) {

		/*if hasnot, find enpty entry*/

		entry_index = hns_dsaf_find_empty_mac_entry(dsaf_dev);

		if (entry_index == DSAF_INVALID_ENTRY_IDX) {

			/*if hasnot empty, error*/

			dev_err(dsaf_dev->dev,

				"set_uc_entry failed, %s Mac key(%#x:%#x)\n",

				dsaf_dev->ae_dev.name,

				mac_key.high.val, mac_key.low.val);

			return -EINVAL;

		}



		/* config hardware entry */

		memset(mac_data.tbl_mcast_port_msk,

		       0, sizeof(mac_data.tbl_mcast_port_msk));

	} else {

		/* config hardware entry */

		hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data,

				     &mac_data);



		tmp_mac_key.high.val =

			le32_to_cpu(tcam_data.tbl_tcam_data_high);

		tmp_mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);

	}

	mac_data.tbl_mcast_old_en = 0;

	mac_data.tbl_mcast_item_vld = 1;

	dsaf_set_field(mac_data.tbl_mcast_port_msk[0],

		       0x3F, 0, mac_entry->port_mask[0]);



	dev_dbg(dsaf_dev->dev,

		"set_uc_entry, %s key(%#x:%#x) entry_index%d\n",

		dsaf_dev->ae_dev.name, mac_key.high.val,

		mac_key.low.val, entry_index);



	tcam_data.tbl_tcam_data_high = cpu_to_le32(mac_key.high.val);

	tcam_data.tbl_tcam_data_low = cpu_to_le32(mac_key.low.val);



	hns_dsaf_tcam_mc_cfg(dsaf_dev, entry_index, &tcam_data, NULL,

			     &mac_data);



	/* config software entry */

	soft_mac_entry += entry_index;

	soft_mac_entry->index = entry_index;

	soft_mac_entry->tcam_key.high.val = mac_key.high.val;

	soft_mac_entry->tcam_key.low.val = mac_key.low.val;



	return 0;

}



static void hns_dsaf_mc_mask_bit_clear(char *dst, const char *src)

{

	u16 *a = (u16 *)dst;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h

+0 −2
Original line number Diff line number Diff line
@@ -429,8 +429,6 @@ static inline struct hnae_vf_cb *hns_ae_get_vf_cb( 


int hns_dsaf_set_mac_uc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_single_dest_entry *mac_entry);

int hns_dsaf_set_mac_mc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_multi_dest_entry *mac_entry);

int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,

			     struct dsaf_drv_mac_single_dest_entry *mac_entry);

int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id,