diff options
author | Michael Wu <flamingice@sourmilk.net> | 2007-05-20 12:44:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-05-29 10:34:05 -0400 |
commit | 52fb24cd83bdd6a1dcbd4cf4b3f5cafb741b5552 (patch) | |
tree | f2c096f7015bd1523fb1652f4c842f42b7069330 /net | |
parent | e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 (diff) |
[PATCH] mac80211: always set carrier status on open
ieee80211_open should always set the carrier status since we may have set
it to off before.
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ieee80211.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 145604abd08e..4e84f24fd439 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
@@ -2474,6 +2474,8 @@ static int ieee80211_open(struct net_device *dev) | |||
2474 | if (sdata->type == IEEE80211_IF_TYPE_STA && | 2474 | if (sdata->type == IEEE80211_IF_TYPE_STA && |
2475 | !local->user_space_mlme) | 2475 | !local->user_space_mlme) |
2476 | netif_carrier_off(dev); | 2476 | netif_carrier_off(dev); |
2477 | else | ||
2478 | netif_carrier_on(dev); | ||
2477 | 2479 | ||
2478 | netif_start_queue(dev); | 2480 | netif_start_queue(dev); |
2479 | return 0; | 2481 | return 0; |