Commit 3f06462b authored by Ivan Vecera's avatar Ivan Vecera Committed by Jakub Kicinski
Browse files

i40e: Delete unused i40e_mac_info fields 



From commit 9eed69a9 ("i40e: Drop FCoE code from core driver files")
the field i40e_mac_info.san_addr is unused (never filled).
The field i40e_mac_info.max_fcoeq is unused from the beginning.
Remove both.

Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Co-developed-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20231113231047.548659-16-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f699a4bf

drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c

+1 −4
Original line number Diff line number Diff line
@@ -827,15 +827,12 @@ static void i40e_dcbnl_get_perm_hw_addr(struct net_device *dev, 
					u8 *perm_addr)

{

	struct i40e_pf *pf = i40e_netdev_to_pf(dev);

	int i, j;

	int i;



	memset(perm_addr, 0xff, MAX_ADDR_LEN);



	for (i = 0; i < dev->addr_len; i++)

		perm_addr[i] = pf->hw.mac.perm_addr[i];



	for (j = 0; j < dev->addr_len; j++, i++)

		perm_addr[i] = pf->hw.mac.san_addr[j];

}



static const struct dcbnl_rtnl_ops dcbnl_ops = {

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -147,9 +147,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 "    state[%d] = %08lx\n",

			 i, vsi->state[i]);

	if (vsi == pf->vsi[pf->lan_vsi])

		dev_info(&pf->pdev->dev, "    MAC address: %pM SAN MAC: %pM Port MAC: %pM\n",

		dev_info(&pf->pdev->dev, "    MAC address: %pM Port MAC: %pM\n",

			 pf->hw.mac.addr,

			 pf->hw.mac.san_addr,

			 pf->hw.mac.port_addr);

	hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {

		dev_info(&pf->pdev->dev,

drivers/net/ethernet/intel/i40e/i40e_type.h

+0 −2
Original line number Diff line number Diff line
@@ -270,9 +270,7 @@ struct i40e_mac_info { 
	enum i40e_mac_type type;

	u8 addr[ETH_ALEN];

	u8 perm_addr[ETH_ALEN];

	u8 san_addr[ETH_ALEN];

	u8 port_addr[ETH_ALEN];

	u16 max_fcoeq;

};



enum i40e_aq_resources_ids {