diff options
author | Jiri Benc <jbenc@suse.cz> | 2005-08-25 20:07:01 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-25 20:07:01 -0400 |
commit | 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe (patch) | |
tree | 8f31ce7cd3da75ad255c1bedc2a16dee75dc21af | |
parent | 53788015c736b9957448aebd7b7c286da217ee51 (diff) |
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>
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 24fc6ef7516a..a47fce4beadf 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) | |||
5685 | IPW_DEBUG_INFO("dev->open\n"); | 5685 | IPW_DEBUG_INFO("dev->open\n"); |
5686 | 5686 | ||
5687 | spin_lock_irqsave(&priv->low_lock, flags); | 5687 | spin_lock_irqsave(&priv->low_lock, flags); |
5688 | if (priv->status & STATUS_ASSOCIATED) | 5688 | if (priv->status & STATUS_ASSOCIATED) { |
5689 | netif_carrier_on(dev); | ||
5689 | netif_start_queue(dev); | 5690 | netif_start_queue(dev); |
5691 | } | ||
5690 | spin_unlock_irqrestore(&priv->low_lock, flags); | 5692 | spin_unlock_irqrestore(&priv->low_lock, flags); |
5691 | 5693 | ||
5692 | return 0; | 5694 | return 0; |