git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
sfc
/
selftest.c
diff --git
a/drivers/net/ethernet/sfc/selftest.c
b/drivers/net/ethernet/sfc/selftest.c
index
822f6c2
..
4907885
100644
(file)
--- a/
drivers/net/ethernet/sfc/selftest.c
+++ b/
drivers/net/ethernet/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) {