Skip to content

Commit 3f06462

Browse files
Ivan Vecerakuba-moo
Ivan Vecera
authored andcommitted
i40e: Delete unused i40e_mac_info fields
From commit 9eed69a ("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 <[email protected]> Co-developed-by: Michal Schmidt <[email protected]> Signed-off-by: Michal Schmidt <[email protected]> Signed-off-by: Ivan Vecera <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent f699a4b commit 3f06462

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -827,15 +827,12 @@ static void i40e_dcbnl_get_perm_hw_addr(struct net_device *dev,
827827
u8 *perm_addr)
828828
{
829829
struct i40e_pf *pf = i40e_netdev_to_pf(dev);
830-
int i, j;
830+
int i;
831831

832832
memset(perm_addr, 0xff, MAX_ADDR_LEN);
833833

834834
for (i = 0; i < dev->addr_len; i++)
835835
perm_addr[i] = pf->hw.mac.perm_addr[i];
836-
837-
for (j = 0; j < dev->addr_len; j++, i++)
838-
perm_addr[i] = pf->hw.mac.san_addr[j];
839836
}
840837

841838
static const struct dcbnl_rtnl_ops dcbnl_ops = {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
147147
" state[%d] = %08lx\n",
148148
i, vsi->state[i]);
149149
if (vsi == pf->vsi[pf->lan_vsi])
150-
dev_info(&pf->pdev->dev, " MAC address: %pM SAN MAC: %pM Port MAC: %pM\n",
150+
dev_info(&pf->pdev->dev, " MAC address: %pM Port MAC: %pM\n",
151151
pf->hw.mac.addr,
152-
pf->hw.mac.san_addr,
153152
pf->hw.mac.port_addr);
154153
hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {
155154
dev_info(&pf->pdev->dev,

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

-2
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,7 @@ struct i40e_mac_info {
270270
enum i40e_mac_type type;
271271
u8 addr[ETH_ALEN];
272272
u8 perm_addr[ETH_ALEN];
273-
u8 san_addr[ETH_ALEN];
274273
u8 port_addr[ETH_ALEN];
275-
u16 max_fcoeq;
276274
};
277275

278276
enum i40e_aq_resources_ids {

0 commit comments

Comments
 (0)