From 3cc7b544bde2f87da84a0bd3a8e2cd17a3024442 Mon Sep 17 00:00:00 2001 From: Luciano Coelho <luciano.coelho@nokia.com> Date: Thu, 8 Jul 2010 17:50:08 +0300 Subject: [PATCH] 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> --- drivers/net/wireless/wl12xx/wl1271_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/wl1271_scan.c index f938b33912f5f..fec43eed8c553 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); -- GitLab