mac80211: sync with master branch as of 9edff13abd97
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch
1 From e37d93abaabe3ab72b0332a18092acc162307274 Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Mon, 30 Sep 2013 13:57:26 +0200
4 Subject: [PATCH] rt2x00: rt2800lib: fix txpower_to_dev function for RT3883
5
6 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
7 ---
8 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 ++++--
9 1 file changed, 4 insertions(+), 2 deletions(-)
10
11 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
12 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
13 @@ -3358,13 +3358,15 @@ static char rt2800_txpower_to_dev(struct
14 unsigned int channel,
15 char txpower)
16 {
17 - if (rt2x00_rt(rt2x00dev, RT3593))
18 + if (rt2x00_rt(rt2x00dev, RT3593) ||
19 + rt2x00_rt(rt2x00dev, RT3883))
20 txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
21
22 if (channel <= 14)
23 return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
24
25 - if (rt2x00_rt(rt2x00dev, RT3593))
26 + if (rt2x00_rt(rt2x00dev, RT3593) ||
27 + rt2x00_rt(rt2x00dev, RT3883))
28 return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
29 MAX_A_TXPOWER_3593);
30 else