Skip to content

Commit 25e2735

Browse files
committed
Merge branch 'mlxsw-updates'
Ido Schimmel says: ==================== mlxsw: Various updates Patch #1 removes deadcode reported by Coverity. Patch #2 adds a shutdown method in the PCI driver to ensure the kexeced kernel starts working with a device that is in a sane state. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 3b0e041 + c1020d3 commit 25e2735

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/net/ethernet/mellanox/mlxsw/pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,6 +1973,7 @@ int mlxsw_pci_driver_register(struct pci_driver *pci_driver)
19731973
{
19741974
pci_driver->probe = mlxsw_pci_probe;
19751975
pci_driver->remove = mlxsw_pci_remove;
1976+
pci_driver->shutdown = mlxsw_pci_remove;
19761977
return pci_register_driver(pci_driver);
19771978
}
19781979
EXPORT_SYMBOL(mlxsw_pci_driver_register);

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8369,9 +8369,6 @@ mlxsw_sp_rif_mac_profile_find(const struct mlxsw_sp *mlxsw_sp, const char *mac)
83698369
int id;
83708370

83718371
idr_for_each_entry(&router->rif_mac_profiles_idr, profile, id) {
8372-
if (!profile)
8373-
continue;
8374-
83758372
if (ether_addr_equal_masked(profile->mac_prefix, mac,
83768373
mlxsw_sp->mac_mask))
83778374
return profile;

0 commit comments

Comments
 (0)