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

Conflicts: drivers/net/yellowfin.c
2009-09-02 00:32:56 -07:00
parent 0625491493 2fbd3da387
commit 6cdee2f96a
50 changed files with 389 additions and 227 deletions
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1305,6 +1305,8 @@ static int emac_close(struct net_device *ndev)

 	free_irq(dev->emac_irq, dev);

+	netif_carrier_off(ndev);
+
 	return 0;
 }