diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 11:17:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 11:17:24 -0800 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /drivers/net/wireless/b43legacy/main.c | |
| parent | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (diff) | |
| parent | bcb628d579a61d0ab0cac4c6cc8a403de5254920 (diff) | |
| download | linux-next-f6d773cd4f3c18c40ab25a5cb92453756237840e.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 0983406f4630..d579bb9035c4 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2676,7 +2676,7 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, if (conf->channel->hw_value != phy->channel) b43legacy_radio_selectchannel(dev, conf->channel->hw_value, 0); - dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_RADIOTAP); + dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_MONITOR); /* Adjust the desired TX power level. */ if (conf->power_level != 0) { |