Re: [Intel-wired-lan] [PATCH iwl-next] i40e: Delete unused i40e_mac_info fields

[Wojciech Drewek]

On 25.10.2023 12:59, Ivan Vecera wrote:
> From commit 9eed69a9147c ("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.
> 
> Co-developed-by: Michal Schmidt <mschmidt@xxxxxxxxxx>

Signed-off-by from Michal is needed, other than that:
Reviewed-by: Wojciech Drewek <wojciech.drewek@xxxxxxxxx>

> Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c  | 5 +----
>  drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +--
>  drivers/net/ethernet/intel/i40e/i40e_type.h    | 2 --
>  3 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
> index 1ee77a2433c0..4721845fda6e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
> @@ -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 = {
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> index e0849f0c9c27..88240571721a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> @@ -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,
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
> index e3d40630f689..76bcbaec8ae5 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
> @@ -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 {