Includes the following changes: 9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions 75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode 368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups 66a63d25c4 mac80211: fix build on linux 3.18 9eacb9d7fc rt2x00: mt7620: lots of improvements fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9 649e766a64 mac80211: update to wireless-testing 2017-01-31 47540afa5d ath9k: add a warning to the tx99 config option b367eef21d mac80211: rt2x00: add support for external LNA on MT7620 9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau <nbd@nbd.name>
20 lines
764 B
Diff
20 lines
764 B
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
@@ -955,6 +955,16 @@ static int rt2x00lib_probe_hw_modes(stru
|
|
struct ieee80211_rate *rates;
|
|
unsigned int num_rates;
|
|
unsigned int i;
|
|
+#ifdef CONFIG_OF
|
|
+ struct device_node *np = rt2x00dev->dev->of_node;
|
|
+ unsigned int enabled;
|
|
+ if (!of_property_read_u32(np, "ralink,2ghz",
|
|
+ &enabled) && !enabled)
|
|
+ spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
|
|
+ if (!of_property_read_u32(np, "ralink,5ghz",
|
|
+ &enabled) && !enabled)
|
|
+ spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
|
|
+#endif /* CONFIG_OF */
|
|
|
|
if (rt2x00dev->dev->platform_data) {
|
|
struct rt2x00_platform_data *pdata;
|