Commit 25e2735d authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b0e0414 c1020d3c

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

+1 −0
Original line number Diff line number Diff line
@@ -1973,6 +1973,7 @@ int mlxsw_pci_driver_register(struct pci_driver *pci_driver) 
{

	pci_driver->probe = mlxsw_pci_probe;

	pci_driver->remove = mlxsw_pci_remove;

	pci_driver->shutdown = mlxsw_pci_remove;

	return pci_register_driver(pci_driver);

}

EXPORT_SYMBOL(mlxsw_pci_driver_register);

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

+0 −3
Original line number Diff line number Diff line
@@ -8369,9 +8369,6 @@ mlxsw_sp_rif_mac_profile_find(const struct mlxsw_sp *mlxsw_sp, const char *mac) 
	int id;



	idr_for_each_entry(&router->rif_mac_profiles_idr, profile, id) {

		if (!profile)

			continue;



		if (ether_addr_equal_masked(profile->mac_prefix, mac,

					    mlxsw_sp->mac_mask))

			return profile;