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>
19 lines
766 B
Diff
19 lines
766 B
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
@@ -1027,6 +1027,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;
|