diff options
| author | Daniel Pieczko <dpieczko@solarflare.com> | 2012-10-17 13:21:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:06:00 -0700 |
| commit | 376ed848f420a921325e9dc144c9cc7fa3829a38 (patch) | |
| tree | 01c91dcff8aec246b52ee6d5740d395c1bc40f7f /drivers/net/sfc/selftest.c | |
| parent | 442933f2b6a4c0e1d4a3b216c55c720a01c032be (diff) | |
| download | kernel_samsung_aries-376ed848f420a921325e9dc144c9cc7fa3829a38.zip kernel_samsung_aries-376ed848f420a921325e9dc144c9cc7fa3829a38.tar.gz kernel_samsung_aries-376ed848f420a921325e9dc144c9cc7fa3829a38.tar.bz2 | |
sfc: lock TX queues when calling netif_device_detach()
[ Upstream commit c2f3b8e3a44b6fe9e36704e30157ebe1a88c08b1 ]
The assertion of netif_device_present() at the top of
efx_hard_start_xmit() may fail if we don't do this.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
[bwh: Backported to 3.0: adjust context]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/sfc/selftest.c')
| -rw-r--r-- | drivers/net/sfc/selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index 822f6c2..4907885 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c @@ -698,7 +698,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests, /* Detach the device so the kernel doesn't transmit during the * loopback test and the watchdog timeout doesn't fire. */ - netif_device_detach(efx->net_dev); + efx_device_detach_sync(efx); mutex_lock(&efx->mac_lock); if (efx->loopback_modes) { |