diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /drivers/net/smsc911x.c | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index d61514698bb3..ad3cbc91a8fa 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -1225,6 +1225,10 @@ static int smsc911x_open(struct net_device *dev) | |||
| 1225 | dev_info(&dev->dev, "SMSC911x/921x identified at %#08lx, IRQ: %d\n", | 1225 | dev_info(&dev->dev, "SMSC911x/921x identified at %#08lx, IRQ: %d\n", |
| 1226 | (unsigned long)pdata->ioaddr, dev->irq); | 1226 | (unsigned long)pdata->ioaddr, dev->irq); |
| 1227 | 1227 | ||
| 1228 | /* Reset the last known duplex and carrier */ | ||
| 1229 | pdata->last_duplex = -1; | ||
| 1230 | pdata->last_carrier = -1; | ||
| 1231 | |||
| 1228 | /* Bring the PHY up */ | 1232 | /* Bring the PHY up */ |
| 1229 | phy_start(pdata->phy_dev); | 1233 | phy_start(pdata->phy_dev); |
| 1230 | 1234 | ||