From: Luciano Coelho Date: Thu, 8 Jul 2010 14:50:08 +0000 (+0300) Subject: wl1271: use per-channel max tx power passed by mac80211 when scanning X-Git-Tag: v2.6.36-rc1~571^2~107^2~79 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cc7b544bde2f87da84a0bd3a8e2cd17a3024442;p=platform%2Fkernel%2Flinux-exynos.git 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 Reviewed-by: Saravanan Dhanabal Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/wl1271_scan.c index f938b33..fec43ee 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);