Commit 7dcc9d8a authored by Edward Cree's avatar Edward Cree Committed by Jakub Kicinski

sfc: don't double-down() filters in ef100_reset()

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: a9dc3d56 ("sfc_ef100: RX filter table management and related gubbins")
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 30ebaf8e
...@@ -428,24 +428,12 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type) ...@@ -428,24 +428,12 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type)
__clear_bit(reset_type, &efx->reset_pending); __clear_bit(reset_type, &efx->reset_pending);
rc = dev_open(efx->net_dev, NULL); rc = dev_open(efx->net_dev, NULL);
} else if (reset_type == RESET_TYPE_ALL) { } 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); rc = efx_mcdi_reset(efx, reset_type);
if (rc) if (rc)
return rc; return rc;
netif_device_attach(efx->net_dev); 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); rc = dev_open(efx->net_dev, NULL);
} else { } else {
rc = 1; /* Leave the device closed */ rc = 1; /* Leave the device closed */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment