399d5cf532
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
24 lines
910 B
Diff
24 lines
910 B
Diff
From c4d79e344bd580d85821390d49f92dced7d8e125 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Sun, 24 Mar 2013 19:26:29 +0100
|
|
Subject: [PATCH] rt2x00: rt2800lib: use correct txpower calculation function
|
|
for RT3883
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -5085,7 +5085,8 @@ static void rt2800_config_txpower(struct
|
|
struct ieee80211_channel *chan,
|
|
int power_level)
|
|
{
|
|
- if (rt2x00_rt(rt2x00dev, RT3593))
|
|
+ if (rt2x00_rt(rt2x00dev, RT3593) ||
|
|
+ rt2x00_rt(rt2x00dev, RT3883))
|
|
rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level);
|
|
else if (rt2x00_rt(rt2x00dev, RT6352))
|
|
rt2800_config_txpower_rt6352(rt2x00dev, chan, power_level);
|