diff options
| author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-07-08 17:50:08 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-08 16:42:23 -0400 |
| commit | 3cc7b544bde2f87da84a0bd3a8e2cd17a3024442 (patch) | |
| tree | 0d957b74addf7b4c4d96be8e19be03bee69e77fd /drivers/net | |
| parent | 08688d6b1a85484cc8e4a920afc60ffa6559999d (diff) | |
| download | blackbird-obmc-linux-3cc7b544bde2f87da84a0bd3a8e2cd17a3024442.tar.gz blackbird-obmc-linux-3cc7b544bde2f87da84a0bd3a8e2cd17a3024442.zip | |
wl1271: use per-channel max tx power passed by mac80211 when scanning
We were always using the max transmit power when scanning. Now we use the
values passed to the driver by the mac80211 stack, so that we comply with
regulations.
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/wl1271_scan.c index f938b33912f5..fec43eed8c55 100644 --- a/drivers/net/wireless/wl12xx/wl1271_scan.c +++ b/drivers/net/wireless/wl12xx/wl1271_scan.c @@ -65,7 +65,7 @@ static int wl1271_get_scan_channels(struct wl1271 *wl, channels[j].max_duration = cpu_to_le32(WL1271_SCAN_CHAN_MAX_DURATION); channels[j].early_termination = 0; - channels[j].tx_power_att = WL1271_SCAN_CURRENT_TX_PWR; + channels[j].tx_power_att = req->channels[i]->max_power; channels[j].channel = req->channels[i]->hw_value; memset(&channels[j].bssid_lsb, 0xff, 4); |
