diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-18 17:36:09 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-18 17:36:09 +0000 |
| commit | a86166f6be048e1bde08cd4e91e8a9d3f868e401 (patch) | |
| tree | d1ff9aada3d518e50f326b62fe20d8e3bd53ba03 /package | |
| parent | b7f6442aeb5f42969f7d6a7a6d05c1eadbf61e32 (diff) | |
| download | upstream-a86166f6be048e1bde08cd4e91e8a9d3f868e401.tar.gz upstream-a86166f6be048e1bde08cd4e91e8a9d3f868e401.tar.bz2 upstream-a86166f6be048e1bde08cd4e91e8a9d3f868e401.zip | |
mac80211: rt2x00: allow to disable bands via platform data
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30629 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/Makefile | 2 | ||||
| -rw-r--r-- | package/mac80211/patches/608-rt2x00-allow_disabling_bands_through_platform_data.patch | 47 |
2 files changed, 48 insertions, 1 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 13727d153a..1c1ff0db4f 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=2012-02-06 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_MD5SUM:=fae71c35ee3f3de6329f2db7aed6d265 diff --git a/package/mac80211/patches/608-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/mac80211/patches/608-rt2x00-allow_disabling_bands_through_platform_data.patch new file mode 100644 index 0000000000..df8f44509e --- /dev/null +++ b/package/mac80211/patches/608-rt2x00-allow_disabling_bands_through_platform_data.patch @@ -0,0 +1,47 @@ +--- a/include/linux/rt2x00_platform.h ++++ b/include/linux/rt2x00_platform.h +@@ -14,6 +14,9 @@ + + struct rt2x00_platform_data { + char *eeprom_file_name; ++ ++ int disable_2ghz; ++ int disable_5ghz; + }; + + #endif /* _RT2X00_PLATFORM_H */ +--- a/drivers/net/wireless/rt2x00/rt2x00dev.c ++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c +@@ -825,6 +825,22 @@ static int rt2x00lib_probe_hw_modes(stru + unsigned int num_rates; + unsigned int i; + ++ if (rt2x00dev->dev->platform_data) { ++ struct rt2x00_platform_data *pdata; ++ ++ pdata = rt2x00dev->dev->platform_data; ++ if (pdata->disable_2ghz) ++ spec->supported_bands &= ~SUPPORT_BAND_2GHZ; ++ if (pdata->disable_5ghz) ++ spec->supported_bands &= ~SUPPORT_BAND_5GHZ; ++ } ++ ++ if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) { ++ ERROR(rt2x00dev, "No supported bands\n"); ++ return -EINVAL; ++ } ++ ++ + num_rates = 0; + if (spec->supported_rates & SUPPORT_RATE_CCK) + num_rates += 4; +--- a/drivers/net/wireless/rt2x00/rt2x00.h ++++ b/drivers/net/wireless/rt2x00/rt2x00.h +@@ -420,6 +420,7 @@ struct hw_mode_spec { + unsigned int supported_bands; + #define SUPPORT_BAND_2GHZ 0x00000001 + #define SUPPORT_BAND_5GHZ 0x00000002 ++#define SUPPORT_BAND_BOTH (SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ) + + unsigned int supported_rates; + #define SUPPORT_RATE_CCK 0x00000001 |