diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2010-10-11 15:45:35 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-06 18:08:16 -0500 |
| commit | 9303c5eda74b6be97155b83a2ba6ffcdf98d2845 (patch) | |
| tree | e3be9a0e6fc97c4e161818ed8c37495ff35c7dab /drivers/net | |
| parent | 14c4f079fde2791e39f9177fee7d6a3829214bde (diff) | |
| download | linux-stable-9303c5eda74b6be97155b83a2ba6ffcdf98d2845.tar.gz linux-stable-9303c5eda74b6be97155b83a2ba6ffcdf98d2845.tar.bz2 linux-stable-9303c5eda74b6be97155b83a2ba6ffcdf98d2845.zip | |
b44: fix carrier detection on bind
commit bcf64aa379fcadd074449cbf0c049da70071b06f upstream.
For carrier detection to work properly when binding the driver with a cable
unplugged, netif_carrier_off() should be called after register_netdev(),
not before.
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 69d9f3d368ae..7a4d6802bf6d 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2170,8 +2170,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev, dev->irq = sdev->irq; SET_ETHTOOL_OPS(dev, &b44_ethtool_ops); - netif_carrier_off(dev); - err = ssb_bus_powerup(sdev->bus, 0); if (err) { dev_err(sdev->dev, @@ -2211,6 +2209,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev, goto err_out_powerdown; } + netif_carrier_off(dev); + ssb_set_drvdata(sdev, dev); /* Chip reset provides power to the b44 MAC & PCI cores, which |