diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-24 20:35:43 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-24 20:35:43 (GMT) |
| commit | 255e87657a84e21986e5d9070f3dee4aa8d1d531 (patch) | |
| tree | c20e26ce24779333d927fa4b172deb2d9df59ebf /drivers/net/ethernet/sfc/falcon_boards.c | |
| parent | 85c21049fc588e0a51b443fe2bad348d18f4992c (diff) | |
| parent | 8f8b3d518999fd1c342310910aa1e49112c86d05 (diff) | |
| download | linux-fsl-qoriq-255e87657a84e21986e5d9070f3dee4aa8d1d531.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. Change the TX path to stop queues earlier and avoid returning
NETDEV_TX_BUSY.
2. Remove some inefficiencies in soft-TSO.
3. Fix various bugs involving device state transitions and/or reset
scheduling by error handlers.
4. Take advantage of my previous change to operstate initialisation.
5. Miscellaneous cleanup.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/falcon_boards.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/falcon_boards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c index 8687a6c..ec1e99d 100644 --- a/drivers/net/ethernet/sfc/falcon_boards.c +++ b/drivers/net/ethernet/sfc/falcon_boards.c @@ -380,7 +380,7 @@ static ssize_t set_phy_flash_cfg(struct device *dev, new_mode = PHY_MODE_SPECIAL; if (!((old_mode ^ new_mode) & PHY_MODE_SPECIAL)) { err = 0; - } else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) { + } else if (efx->state != STATE_READY || netif_running(efx->net_dev)) { err = -EBUSY; } else { /* Reset the PHY, reconfigure the MAC and enable/disable |