]> err.no Git - linux-2.6/commitdiff
ipw2100: interface-up carrier state fix
authorJiri Benc <jbenc@suse.cz>
Fri, 26 Aug 2005 00:07:01 +0000 (20:07 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 26 Aug 2005 00:07:01 +0000 (20:07 -0400)
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>
drivers/net/wireless/ipw2100.c

index 24fc6ef7516a9d5d539ef722e5cd96737c533c78..a47fce4beadf90ac9f1d4af5046cb4aabc8cd9d3 100644 (file)
@@ -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;