From: Jiri Benc <jbenc@suse.cz>
Date: Fri, 26 Aug 2005 00:07:01 +0000 (-0400)
Subject: ipw2100: interface-up carrier state fix
X-Git-Tag: v2.6.14-rc1~1017^2~7^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe;p=linux-2.6

ipw2100: interface-up carrier state fix

From: Imre Deak <imre.deak@nokia.com>

I had a problem where doing an open after a close left the device
unusable. netif_carrier_on should be called whenever we go to the
associated state, but this is not so in case of a close->open sequence.

Signed-off-by: Jiri Benc <jbenc@suse.cz>
---

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 24fc6ef751..a47fce4bea 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/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;