66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
|
From 4009f1317cb51ac89f37241de48970f2ee6a8ec5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ivo van Doorn <IvDoorn@gmail.com>
|
||
|
|
Date: Sat, 7 Feb 2009 17:18:03 +0100
|
||
|
|
Subject: [PATCH] rt2x00: Fix MCS rx_mask (rt2800pci)
|
||
|
|
|
||
|
|
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/rt2x00/rt2800pci.c | 22 ++++++++++++++++++++--
|
||
|
|
1 files changed, 20 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
|
||
|
|
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
|
||
|
|
@@ -2193,6 +2193,13 @@ static int rt2800pci_validate_eeprom(str
|
||
|
|
rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2820);
|
||
|
|
rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
|
||
|
|
EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
|
||
|
|
+ } else if (rt2x00_rev(&rt2x00dev->chip) < RT2883_VERSION) {
|
||
|
|
+ /*
|
||
|
|
+ * There is a max of 2 RX streams for RT2860 series
|
||
|
|
+ */
|
||
|
|
+ if (rt2x00_get_field16(word, EEPROM_ANTENNA_RXPATH) > 2)
|
||
|
|
+ rt2x00_set_field16(&word, EEPROM_ANTENNA_RXPATH, 2);
|
||
|
|
+ rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
|
||
|
|
}
|
||
|
|
|
||
|
|
rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
|
||
|
|
@@ -2416,6 +2423,7 @@ static int rt2800pci_probe_hw_mode(struc
|
||
|
|
char *tx_power1;
|
||
|
|
char *tx_power2;
|
||
|
|
unsigned int i;
|
||
|
|
+ u16 eeprom;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Initialize all hw fields.
|
||
|
|
@@ -2432,6 +2440,8 @@ static int rt2800pci_probe_hw_mode(struc
|
||
|
|
rt2x00_eeprom_addr(rt2x00dev,
|
||
|
|
EEPROM_MAC_ADDR_0));
|
||
|
|
|
||
|
|
+ rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &eeprom);
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Initialize hw_mode information.
|
||
|
|
*/
|
||
|
|
@@ -2463,11 +2473,19 @@ static int rt2800pci_probe_hw_mode(struc
|
||
|
|
IEEE80211_HT_CAP_PSMP_SUPPORT;
|
||
|
|
spec->ht.ampdu_factor = 3;
|
||
|
|
spec->ht.ampdu_density = 4;
|
||
|
|
- spec->ht.mcs.rx_mask[0] = 0xff;
|
||
|
|
- spec->ht.mcs.rx_mask[1] = 0xff;
|
||
|
|
spec->ht.mcs.tx_params =
|
||
|
|
IEEE80211_HT_MCS_TX_DEFINED;
|
||
|
|
|
||
|
|
+ switch (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH)) {
|
||
|
|
+ case 3:
|
||
|
|
+ spec->ht.mcs.rx_mask[2] = 0xff;
|
||
|
|
+ case 2:
|
||
|
|
+ spec->ht.mcs.rx_mask[1] = 0xff;
|
||
|
|
+ case 1:
|
||
|
|
+ spec->ht.mcs.rx_mask[0] = 0xff;
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Create channel information array
|
||
|
|
*/
|