aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-09-20 16:06:39 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:23 -0400
commit61609bc0e4d3bc677ecdccf216a0a77563f52457 (patch)
tree218ad785638f05c357571b400e0cb3fc21787ece /net/mac80211/ieee80211.c
parent501d857ec93e797d4872d6b9b265b7472b455ddf (diff)
[MAC80211]: Add support for setting TX power and radio status
This adds support for disabling the radio and setting the TXpower through wext. This also fixes the prism TXpower ioctl (It always overwrote the TXpower value in ieee80211_hw_config()) Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r--net/mac80211/ieee80211.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 4229d150e783..23853331e8db 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -704,7 +704,12 @@ int ieee80211_hw_config(struct ieee80211_local *local)
704 704
705 local->hw.conf.channel = chan->chan; 705 local->hw.conf.channel = chan->chan;
706 local->hw.conf.channel_val = chan->val; 706 local->hw.conf.channel_val = chan->val;
707 local->hw.conf.power_level = chan->power_level; 707 if (!local->hw.conf.power_level) {
708 local->hw.conf.power_level = chan->power_level;
709 } else {
710 local->hw.conf.power_level = min(chan->power_level,
711 local->hw.conf.power_level);
712 }
708 local->hw.conf.freq = chan->freq; 713 local->hw.conf.freq = chan->freq;
709 local->hw.conf.phymode = mode->mode; 714 local->hw.conf.phymode = mode->mode;
710 local->hw.conf.antenna_max = chan->antenna_max; 715 local->hw.conf.antenna_max = chan->antenna_max;