diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-10 10:11:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-10 10:11:28 +0000 |
| commit | 724875ae4838ad14313e47d83922440396204c46 (patch) | |
| tree | 7a6ce038257f274f05846d8c988e9f67412d3593 /package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch | |
| parent | e14f5039d63499aa390a06f01217085d415b0d2b (diff) | |
| download | upstream-724875ae4838ad14313e47d83922440396204c46.tar.gz upstream-724875ae4838ad14313e47d83922440396204c46.tar.bz2 upstream-724875ae4838ad14313e47d83922440396204c46.zip | |
rt2x00: merge an rt2800 initialization order fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r37922
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37923 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 10 |
1 files changed, 5 insertions, 5 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 cd9a5f3ec3..e16d97026a 100644 --- a/package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch +++ b/package/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 -@@ -6156,6 +6156,27 @@ static const struct rf_channel rf_vals_5 +@@ -6157,6 +6157,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; -@@ -6234,7 +6255,6 @@ static int rt2800_probe_hw_mode(struct r +@@ -6235,7 +6256,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) || -@@ -6242,6 +6262,12 @@ static int rt2800_probe_hw_mode(struct r +@@ -6243,6 +6263,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); -@@ -6389,6 +6415,19 @@ static int rt2800_probe_rt(struct rt2x00 +@@ -6390,6 +6416,19 @@ static int rt2800_probe_rt(struct rt2x00 return 0; } @@ -69,7 +69,7 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { int retval; -@@ -6418,6 +6457,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r +@@ -6419,6 +6458,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r rt2800_register_write(rt2x00dev, GPIO_CTRL, reg); /* |