diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-09 17:31:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-09 17:31:53 +0000 |
| commit | 247299bfa0b5b18a98a721cdcbf4f5af4ff78a51 (patch) | |
| tree | 503b5bff7313f8ed3ee7665759ad587ea2eb2cfd /package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | |
| parent | e6d015489bc4afc26bdc8e0bc57a54ee7b3b049a (diff) | |
| download | upstream-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.tar.gz upstream-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.tar.bz2 upstream-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.zip | |
rt2x00: merge an rt2800 initialization order fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37922
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 | 10 |
1 files changed, 5 insertions, 5 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 4fc1e0a01b..212b31ee96 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,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -7508,6 +7508,27 @@ static const struct rf_channel rf_vals_3 +@@ -7509,6 +7509,27 @@ static const struct rf_channel rf_vals_3 {173, 0x61, 0, 9}, }; @@ -28,7 +28,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) { struct hw_mode_spec *spec = &rt2x00dev->spec; -@@ -7588,7 +7609,6 @@ static int rt2800_probe_hw_mode(struct r +@@ -7589,7 +7610,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) || -@@ -7596,6 +7616,12 @@ static int rt2800_probe_hw_mode(struct r +@@ -7597,6 +7617,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); -@@ -7768,6 +7794,19 @@ static int rt2800_probe_rt(struct rt2x00 +@@ -7769,6 +7795,19 @@ static int rt2800_probe_rt(struct rt2x00 return 0; } @@ -69,7 +69,7 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { int retval; -@@ -7797,6 +7836,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r +@@ -7798,6 +7837,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r rt2800_register_write(rt2x00dev, GPIO_CTRL, reg); /* |