aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:55:50 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:55:50 -0700
commit61cca8c72eb284e80876bafdea057055f6e793e4 (patch)
tree5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/net/b44.c
parente494f6333bef20fd9d8689062260c5d0136a3ea0 (diff)
parente254e9bff5283aad1af6d74d2a312ee011b84d61 (diff)
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 3fe8ba992c3..f1bd45e3da3 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1285,6 +1285,9 @@ static int b44_open(struct net_device *dev)
b44_init_hw(bp);
bp->flags |= B44_FLAG_INIT_COMPLETE;
+ netif_carrier_off(dev);
+ b44_check_phy(bp);
+
spin_unlock_irq(&bp->lock);
init_timer(&bp->timer);