diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-11-12 22:11:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-11-12 22:11:33 +0000 |
| commit | 5f1c42d8b61c88533fe3dceba81b2634623ecceb (patch) | |
| tree | 755bdce62a4339483ec2efc086feb1af079803fb /package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | |
| parent | 37756a97a0dbb276b79e8bf7ca593991c764a752 (diff) | |
| download | upstream-5f1c42d8b61c88533fe3dceba81b2634623ecceb.tar.gz upstream-5f1c42d8b61c88533fe3dceba81b2634623ecceb.tar.bz2 upstream-5f1c42d8b61c88533fe3dceba81b2634623ecceb.zip | |
mac80211: update to wireless-testing 2013-11-05
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38783
Diffstat (limited to 'package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch index 212b31ee96..8046140355 100644 --- a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch +++ b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch @@ -1,7 +1,7 @@ --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -7509,6 +7509,27 @@ static const struct rf_channel rf_vals_3 - {173, 0x61, 0, 9}, +@@ -7486,6 +7486,27 @@ static const struct rf_channel rf_vals_5 + {196, 83, 0, 12, 1}, }; +/* @@ -28,28 +28,19 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) { struct hw_mode_spec *spec = &rt2x00dev->spec; -@@ -7589,7 +7610,6 @@ static int rt2800_probe_hw_mode(struct r - rt2x00_rf(rt2x00dev, RF3022) || - rt2x00_rf(rt2x00dev, RF3290) || - rt2x00_rf(rt2x00dev, RF3320) || -- rt2x00_rf(rt2x00dev, RF3322) || - rt2x00_rf(rt2x00dev, RF5360) || - rt2x00_rf(rt2x00dev, RF5370) || - rt2x00_rf(rt2x00dev, RF5372) || -@@ -7597,6 +7617,12 @@ static int rt2800_probe_hw_mode(struct r - rt2x00_rf(rt2x00dev, RF5392)) { +@@ -7574,7 +7595,10 @@ static int rt2800_probe_hw_mode(struct r + case RF5390: + case RF5392: spec->num_channels = 14; - spec->channels = rf_vals_3x; -+ } else if (rt2x00_rf(rt2x00dev, RF3322)) { -+ spec->num_channels = 14; +- spec->channels = rf_vals_3x; + if (spec->clk_is_20mhz) + spec->channels = rf_vals_xtal20mhz_3x; + else + spec->channels = rf_vals_3x; - } else if (rt2x00_rf(rt2x00dev, RF3052)) { - spec->supported_bands |= SUPPORT_BAND_5GHZ; - spec->num_channels = ARRAY_SIZE(rf_vals_3x); -@@ -7769,6 +7795,19 @@ static int rt2800_probe_rt(struct rt2x00 + break; + + case RF3052: +@@ -7750,6 +7774,19 @@ static int rt2800_probe_rt(struct rt2x00 return 0; } @@ -69,7 +60,7 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { int retval; -@@ -7798,6 +7837,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r +@@ -7779,6 +7816,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r rt2800_register_write(rt2x00dev, GPIO_CTRL, reg); /* @@ -87,7 +78,7 @@ retval = rt2800_probe_hw_mode(rt2x00dev); --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -410,6 +410,7 @@ static inline struct rt2x00_intf* vif_to +@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to * @channels: Device/chipset specific channel values (See &struct rf_channel). * @channels_info: Additional information for channels (See &struct channel_info). * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap). @@ -95,7 +86,7 @@ */ struct hw_mode_spec { unsigned int supported_bands; -@@ -426,6 +427,7 @@ struct hw_mode_spec { +@@ -416,6 +417,7 @@ struct hw_mode_spec { const struct channel_info *channels_info; struct ieee80211_sta_ht_cap ht; |