lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/virtio_net.c
This commit is contained in:
David S. Miller
2009-03-20 02:27:41 -07:00
parent 5e140dfc1f 170ebf8516
commit 2b1c4354de
14 changed files with 108 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/smsc911x.c
View File

@@ -1225,6 +1225,10 @@ static int smsc911x_open(struct net_device *dev)
dev_info(&dev->dev, "SMSC911x/921x identified at %#08lx, IRQ: %d\n",
(unsigned long)pdata->ioaddr, dev->irq);
/* Reset the last known duplex and carrier */
pdata->last_duplex = -1;
pdata->last_carrier = -1;
/* Bring the PHY up */
phy_start(pdata->phy_dev);