From 57312a9a60bac214681cdc6a43d122e8076c19a2 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 13 Dec 2010 08:40:53 +0100
Subject: [PATCH] --- yaml --- r: 225263 b: refs/heads/master c:
 1782352d4908c79d195b43e0c1b6b109e0d93d05 h: refs/heads/master i:   225261:
 b84691ec809c5deb4a420784c915ac4065b77f6e   225259:
 a22818d4bf6fe5b420df5dc18f5ae9e23d720ae3   225255:
 64ce87cb65bbc82f9bc078b4d302592349078260   225247:
 085410db83c5182d44b3e80f61f4a49943e2b3a1 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 6 ++++++
 trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea7fdbdc7469..5b4c4c76f8bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7607cbe2ad6931400c5d15ced342ab329ab8f92c
+refs/heads/master: 1782352d4908c79d195b43e0c1b6b109e0d93d05
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 620821ea6927..efb6a02be377 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -31,6 +31,12 @@
 #define AR9300_ANT_16S               25
 #define AR9300_FUTURE_MODAL_SZ       6
 
+#define AR9300_PAPRD_RATE_MASK		0x01ffffff
+#define AR9300_PAPRD_SCALE_1		0x0e000000
+#define AR9300_PAPRD_SCALE_1_S		25
+#define AR9300_PAPRD_SCALE_2		0x70000000
+#define AR9300_PAPRD_SCALE_2_S		28
+
 /* Delta from which to start power to pdadc table */
 /* This offset is used in both open loop and closed loop power control
  * schemes. In open loop power control, it is not really needed, but for
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 74cff4365c43..cdca4c3265b9 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -52,8 +52,8 @@ static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
 	else
 		hdr = &eep->modalHeader2G;
 
-	am_mask = le32_to_cpu(hdr->papdRateMaskHt20);
-	ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40);
+	am_mask = le32_to_cpu(hdr->papdRateMaskHt20) & AR9300_PAPRD_RATE_MASK;
+	ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40) & AR9300_PAPRD_RATE_MASK;
 
 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK, am_mask);
 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK, am_mask);