i40e: Delete unused i40e_mac_info fields

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.

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

diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
index 1ee77a2433c08dd0f4b5676a7a9130a90cfaf531..4721845fda6e0a7b3578dd80eb7c44ec4c399cc3 100644 (file)
--- 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 e0849f0c9c2703dbf381f4a793cd018f10b5efc4..88240571721a6acd73671f3e87f6747ced477670 100644 (file)
--- 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 e3f73be5eb091ec582d9e43bb975125e5c0c800d..de69c2e22448ccc55b3f89f11fb15b2ad02db9dd 100644 (file)
--- 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 {