mac80211: rt2x00: import upstream changes and rebase our patches
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch
1 From 5ce33b603063f36272fcfb1b4a5fde69f46eca88 Mon Sep 17 00:00:00 2001
2 From: Daniel Golle <daniel@makrotopia.org>
3 Date: Thu, 9 Mar 2017 00:54:22 +0100
4 Subject: [PATCH 18/19] rt2x00: fix TX_PWR_CFG_4 register definition
5
6 Some of the macros used to describe the TX_PWR_CFG_4 register accidentally
7 refer to TX_PWR_CFG_3, probably a copy&paste error. Fix that.
8
9 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
10 Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
12 ---
13 drivers/net/wireless/ralink/rt2x00/rt2800.h | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h
17 index 480b08601785..fd1dbd956bad 100644
18 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
19 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
20 @@ -1171,10 +1171,10 @@
21 #define TX_PWR_CFG_4_UKNOWN7 FIELD32(0x00000f00)
22 #define TX_PWR_CFG_4_UKNOWN8 FIELD32(0x0000f000)
23 /* bits for 3T devices */
24 -#define TX_PWR_CFG_3_STBC4_CH0 FIELD32(0x0000000f)
25 -#define TX_PWR_CFG_3_STBC4_CH1 FIELD32(0x000000f0)
26 -#define TX_PWR_CFG_3_STBC6_CH0 FIELD32(0x00000f00)
27 -#define TX_PWR_CFG_3_STBC6_CH1 FIELD32(0x0000f000)
28 +#define TX_PWR_CFG_4_STBC4_CH0 FIELD32(0x0000000f)
29 +#define TX_PWR_CFG_4_STBC4_CH1 FIELD32(0x000000f0)
30 +#define TX_PWR_CFG_4_STBC6_CH0 FIELD32(0x00000f00)
31 +#define TX_PWR_CFG_4_STBC6_CH1 FIELD32(0x0000f000)
32
33 /*
34 * TX_PIN_CFG:
35 --
36 2.12.1
37