diff options
| author | Peter Dunning <pdunning@solarflare.com> | 2017-02-17 18:50:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-17 23:29:40 +0300 |
| commit | 9c568fd8844ec3986eb19b0b5d97536243d10d46 (patch) | |
| tree | c5080f2edd3d4c029e5e38ede183e135ef81787a /drivers/net/ethernet/sfc/ef10_sriov.c | |
| parent | 105eac6c35a168b8b6d8e594830a1da5585b260d (diff) | |
| download | linux-9c568fd8844ec3986eb19b0b5d97536243d10d46.tar.xz | |
sfc: do not device_attach if a reset is pending
efx_start_all can return without initialising queues as a reset is pending.
This means that when netif_device_attach is called, the kernel can start
sending traffic without having an initialised TX queue to send to.
This patch avoids this by not calling netif_device_attach if there is a
pending reset.
Fixes: e283546c0465 ("sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/ef10_sriov.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/ef10_sriov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c index ed4b14283461..b7e4345c990d 100644 --- a/drivers/net/ethernet/sfc/ef10_sriov.c +++ b/drivers/net/ethernet/sfc/ef10_sriov.c @@ -549,7 +549,7 @@ int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf_i, u8 *mac) vf->efx->type->filter_table_probe(vf->efx); up_write(&vf->efx->filter_sem); efx_net_open(vf->efx->net_dev); - netif_device_attach(vf->efx->net_dev); + efx_device_attach_if_not_resetting(vf->efx); } return 0; @@ -667,7 +667,7 @@ restore_filters: if (rc2) goto reset_nic; - netif_device_attach(vf->efx->net_dev); + efx_device_attach_if_not_resetting(vf->efx); } return rc; |