---

yaml --- r: 203526 b: refs/heads/master c: 3cc7b54 h: refs/heads/master v: v3
git-mirror · Jul 8, 2010 · cb94efc · cb94efc
1 parent ba64420
commit cb94efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08688d6b1a85484cc8e4a920afc60ffa6559999d
+refs/heads/master: 3cc7b544bde2f87da84a0bd3a8e2cd17a3024442
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c b/trunk/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);