diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
commit | accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1 (patch) | |
tree | 3b2ebce435696f7f85164376efffbc7758012c20 /package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | |
parent | bc453a52b2c3b3da4dba056048cb83db195fe189 (diff) | |
download | upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.gz upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.bz2 upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.zip |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36448
Diffstat (limited to 'package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch')
-rw-r--r-- | package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch index 38b56b4e5b..4c81b5e220 100644 --- a/package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch +++ b/package/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 -@@ -5169,6 +5169,27 @@ static const struct rf_channel rf_vals_3 - {173, 0x61, 0, 9}, +@@ -5886,6 +5886,27 @@ static const struct rf_channel rf_vals_5 + {196, 83, 0, 12, 1}, }; +/* @@ -28,7 +28,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) { struct hw_mode_spec *spec = &rt2x00dev->spec; -@@ -5246,7 +5267,6 @@ static int rt2800_probe_hw_mode(struct r +@@ -5964,7 +5985,6 @@ static int rt2800_probe_hw_mode(struct r rt2x00_rf(rt2x00dev, RF3022) || rt2x00_rf(rt2x00dev, RF3290) || rt2x00_rf(rt2x00dev, RF3320) || @@ -36,7 +36,7 @@ rt2x00_rf(rt2x00dev, RF5360) || rt2x00_rf(rt2x00dev, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || -@@ -5254,6 +5274,12 @@ static int rt2800_probe_hw_mode(struct r +@@ -5972,6 +5992,12 @@ static int rt2800_probe_hw_mode(struct r rt2x00_rf(rt2x00dev, RF5392)) { spec->num_channels = 14; spec->channels = rf_vals_3x; @@ -49,7 +49,7 @@ } else if (rt2x00_rf(rt2x00dev, RF3052)) { spec->supported_bands |= SUPPORT_BAND_5GHZ; spec->num_channels = ARRAY_SIZE(rf_vals_3x); -@@ -5347,6 +5373,19 @@ static int rt2800_probe_hw_mode(struct r +@@ -6120,6 +6146,19 @@ static int rt2800_probe_rt(struct rt2x00 return 0; } @@ -69,7 +69,7 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { int retval; -@@ -5372,6 +5411,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r +@@ -6149,6 +6188,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r rt2800_register_write(rt2x00dev, GPIO_CTRL, reg); /* @@ -87,7 +87,7 @@ retval = rt2800_probe_hw_mode(rt2x00dev); --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -419,6 +419,7 @@ static inline struct rt2x00_intf* vif_to +@@ -420,6 +420,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 +95,7 @@ */ struct hw_mode_spec { unsigned int supported_bands; -@@ -435,6 +436,7 @@ struct hw_mode_spec { +@@ -436,6 +437,7 @@ struct hw_mode_spec { const struct channel_info *channels_info; struct ieee80211_sta_ht_cap ht; |