diff options
author | Michael Wu <flamingice@sourmilk.net> | 2007-11-28 01:57:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-11-29 18:08:47 -0500 |
commit | 8b393f1dc76acbe65a97a4e51f8144f4a65fa1c9 (patch) | |
tree | ff1466c1fe5ebd700cc06bde1512900ffcbf5be7 /net/mac80211 | |
parent | 01e1f045e65b683fe7203b1e16a915bbb94c15fe (diff) | |
download | linux-3.10-8b393f1dc76acbe65a97a4e51f8144f4a65fa1c9.tar.gz linux-3.10-8b393f1dc76acbe65a97a4e51f8144f4a65fa1c9.tar.bz2 linux-3.10-8b393f1dc76acbe65a97a4e51f8144f4a65fa1c9.zip |
mac80211: Fix behavior of ieee80211_open and ieee80211_close
This patch fixes:
- Incorrect calls to ieee80211_hw_config when the radiotap flag is set.
- Failure to actually unset the radiotap flag when all monitors are down.
- Failure to call ieee80211_hw_config after successful interface start.
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 8f11c97f13d..0dc114c4ef2 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -216,6 +216,7 @@ static int ieee80211_open(struct net_device *dev) res = local->ops->start(local_to_hw(local)); if (res) return res; + ieee80211_hw_config(local); } switch (sdata->type) { @@ -232,7 +233,6 @@ static int ieee80211_open(struct net_device *dev) netif_tx_unlock_bh(local->mdev); local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP; - ieee80211_hw_config(local); } break; case IEEE80211_IF_TYPE_STA: @@ -311,8 +311,7 @@ static int ieee80211_stop(struct net_device *dev) ieee80211_configure_filter(local); netif_tx_unlock_bh(local->mdev); - local->hw.conf.flags |= IEEE80211_CONF_RADIOTAP; - ieee80211_hw_config(local); + local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP; } break; case IEEE80211_IF_TYPE_STA: |