cantyonion/opi-openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: fix compile warning in rt2800lib.c

Browse Source 
reorder some parts of the patch to remove the declaration-after-
statement warning.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46205
This commit is contained in:
Hauke Mehrtens 2015-07-06 21:43:48 +00:00
parent 10bb005aa1
commit 6097f550e0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
View File

@ -258,6 +258,7 @@
+ u32 mac_sys_ctrl, mac_status; + u32 mac_sys_ctrl, mac_status;
+ u32 tx_pin = 0x00150F0F; + u32 tx_pin = 0x00150F0F;
+ struct hw_mode_spec *spec = &rt2x00dev->spec; + struct hw_mode_spec *spec = &rt2x00dev->spec;
+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
+ +
+ /* Frequeny plan setting */ + /* Frequeny plan setting */
+ /* + /*
@ -383,7 +384,6 @@
+ rfcsr &= (~0x4); + rfcsr &= (~0x4);
+ rt2800_rfcsr_write(rt2x00dev, 28, rfcsr); + rt2800_rfcsr_write(rt2x00dev, 28, rfcsr);
+ +
+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
+ /*if (bScan == FALSE)*/ + /*if (bScan == FALSE)*/
+ if (conf_is_ht40(conf)) { + if (conf_is_ht40(conf)) {
+ txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw40, + txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw40,
@ -867,7 +867,7 @@
break; break;
case RT5592: case RT5592:
rt2800_init_bbp_5592(rt2x00dev); rt2800_init_bbp_5592(rt2x00dev);
@@ -7391,6 +8037,295 @@ static void rt2800_init_rfcsr_5592(struc @@ -7391,6 +8037,296 @@ static void rt2800_init_rfcsr_5592(struc
rt2800_led_open_drain_enable(rt2x00dev); rt2800_led_open_drain_enable(rt2x00dev);
} }
@ -875,6 +875,8 @@
+{ +{
+ u16 freq; + u16 freq;
+ u8 rfvalue; + u8 rfvalue;
+ struct hw_mode_spec *spec = &rt2x00dev->spec;
+
+ /* Initialize RF central register to default value */ + /* Initialize RF central register to default value */
+ rt2800_rfcsr_write(rt2x00dev, 0, 0x02); + rt2800_rfcsr_write(rt2x00dev, 0, 0x02);
+ rt2800_rfcsr_write(rt2x00dev, 1, 0x03); + rt2800_rfcsr_write(rt2x00dev, 1, 0x03);
@ -921,7 +923,6 @@
+ rt2800_rfcsr_write(rt2x00dev, 42, 0x5B); + rt2800_rfcsr_write(rt2x00dev, 42, 0x5B);
+ rt2800_rfcsr_write(rt2x00dev, 43, 0x00); + rt2800_rfcsr_write(rt2x00dev, 43, 0x00);
+ +
+ struct hw_mode_spec *spec = &rt2x00dev->spec;
+ rt2800_rfcsr_write(rt2x00dev, 11, 0x21); + rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+ if (spec->clk_is_20mhz) + if (spec->clk_is_20mhz)
+ rt2800_rfcsr_write(rt2x00dev, 13, 0x03); + rt2800_rfcsr_write(rt2x00dev, 13, 0x03);
@ -1163,7 +1164,7 @@
static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
{ {
if (rt2800_is_305x_soc(rt2x00dev)) { if (rt2800_is_305x_soc(rt2x00dev)) {
@@ -7426,7 +8361,10 @@ static void rt2800_init_rfcsr(struct rt2 @@ -7426,7 +8362,10 @@ static void rt2800_init_rfcsr(struct rt2
rt2800_init_rfcsr_5350(rt2x00dev); rt2800_init_rfcsr_5350(rt2x00dev);
break; break;
case RT5390: case RT5390:
@ -1175,7 +1176,7 @@
break; break;
case RT5392: case RT5392:
rt2800_init_rfcsr_5392(rt2x00dev); rt2800_init_rfcsr_5392(rt2x00dev);
@@ -7858,6 +8796,7 @@ static int rt2800_init_eeprom(struct rt2 @@ -7858,6 +8797,7 @@ static int rt2800_init_eeprom(struct rt2
case RF5390: case RF5390:
case RF5392: case RF5392:
case RF5592: case RF5592:
@ -1183,7 +1184,7 @@
break; break;
default: default:
rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n", rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
@@ -8422,6 +9361,7 @@ static int rt2800_probe_hw_mode(struct r @@ -8422,6 +9362,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372: case RF5372:
case RF5390: case RF5390:
case RF5392: case RF5392:
@ -1191,7 +1192,7 @@
spec->num_channels = 14; spec->num_channels = 14;
if (spec->clk_is_20mhz) if (spec->clk_is_20mhz)
spec->channels = rf_vals_xtal20mhz_3x; spec->channels = rf_vals_xtal20mhz_3x;
@@ -8562,6 +9502,7 @@ static int rt2800_probe_hw_mode(struct r @@ -8562,6 +9503,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372: case RF5372:
case RF5390: case RF5390:
case RF5392: case RF5392: