From 03dfab46308da5f7702013062261855092b5753e Mon Sep 17 00:00:00 2001
From: Jiri Benc <jbenc@suse.cz>
Date: Thu, 25 Aug 2005 20:07:01 -0400
Subject: [PATCH] --- yaml --- r: 6785 b: refs/heads/master c:
 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe h: refs/heads/master i:   6783:
 9ffc87e7b61804cd8fd13c521c9ba55ee75035ea v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2100.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f542109c0f8..2d91957c85b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53788015c736b9957448aebd7b7c286da217ee51
+refs/heads/master: 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe
diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c
index 24fc6ef7516a..a47fce4beadf 100644
--- a/trunk/drivers/net/wireless/ipw2100.c
+++ b/trunk/drivers/net/wireless/ipw2100.c
@@ -5685,8 +5685,10 @@ static int ipw2100_open(struct net_device *dev)
 	IPW_DEBUG_INFO("dev->open\n");
 
 	spin_lock_irqsave(&priv->low_lock, flags);
-	if (priv->status & STATUS_ASSOCIATED)
+	if (priv->status & STATUS_ASSOCIATED) {
+		netif_carrier_on(dev);
 		netif_start_queue(dev);
+	}
 	spin_unlock_irqrestore(&priv->low_lock, flags);
 
 	return 0;