sfc: don't double-down() filters in ef100_reset() (7dcc9d8a) · Commits · 戴 / test

dev_close(), by way of ef100_net_stop(), already brings down the filter table, so there's no need to do it again (which just causes lots of WARN_ONs). Similarly, don't bring it up ourselves, as dev_open() -> ef100_net_open() will do it, and will fail if it's already been brought up. Fixes: ("sfc_ef100: RX filter table management and related gubbins") Signed-off-by:

Edward Cree <ecree@solarflare.com> Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/sfc/ef100_nic.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -428,24 +428,12 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type)
		__clear_bit(reset_type, &efx->reset_pending);
		rc = dev_open(efx->net_dev, NULL);
		} else if (reset_type == RESET_TYPE_ALL) {
		/* A RESET_TYPE_ALL will cause filters to be removed, so we remove filters
		* and reprobe after reset to avoid removing filters twice
		*/
		down_write(&efx->filter_sem);
		ef100_filter_table_down(efx);
		up_write(&efx->filter_sem);
		rc = efx_mcdi_reset(efx, reset_type);
		if (rc)
		return rc;

		netif_device_attach(efx->net_dev);

		down_write(&efx->filter_sem);
		rc = ef100_filter_table_up(efx);
		up_write(&efx->filter_sem);
		if (rc)
		return rc;

		rc = dev_open(efx->net_dev, NULL);
		} else {
		rc = 1; /* Leave the device closed */

Admin message