summaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorDavid Woodhouse2005-07-02 14:39:09 +0200
committerDavid Woodhouse2005-07-02 14:39:09 +0200
commitd2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree3bdfb97d0b51be2f7f414f2107e97603c1206abb /drivers/net/b44.c
parentAUDIT: Use KERN_NOTICE for printk of audit records (diff)
parent[PATCH] alpha smp fix (part #2) (diff)
downloadkernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.gz
kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz
kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 3fe8ba992c38..f1bd45e3da31 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);