kernel: fix wrong line for the +@DRIVER_WEXT_SUPPORT dependency in kmod-net-zd1201
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 564-ath9k-remove-superfluous-parentheses.patch
1 --- a/drivers/net/wireless/ath/ath9k/recv.c
2 +++ b/drivers/net/wireless/ath/ath9k/recv.c
3 @@ -1078,39 +1078,39 @@ static void ath_lnaconf_alt_good_scan(st
4 antcomb->rssi_lna1 = main_rssi_avg;
5
6 switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
7 - case (0x10): /* LNA2 A-B */
8 + case 0x10: /* LNA2 A-B */
9 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
10 antcomb->first_quick_scan_conf =
11 ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
12 antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
13 break;
14 - case (0x20): /* LNA1 A-B */
15 + case 0x20: /* LNA1 A-B */
16 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
17 antcomb->first_quick_scan_conf =
18 ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
19 antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
20 break;
21 - case (0x21): /* LNA1 LNA2 */
22 + case 0x21: /* LNA1 LNA2 */
23 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
24 antcomb->first_quick_scan_conf =
25 ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
26 antcomb->second_quick_scan_conf =
27 ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
28 break;
29 - case (0x12): /* LNA2 LNA1 */
30 + case 0x12: /* LNA2 LNA1 */
31 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
32 antcomb->first_quick_scan_conf =
33 ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
34 antcomb->second_quick_scan_conf =
35 ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
36 break;
37 - case (0x13): /* LNA2 A+B */
38 + case 0x13: /* LNA2 A+B */
39 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
40 antcomb->first_quick_scan_conf =
41 ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
42 antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
43 break;
44 - case (0x23): /* LNA1 A+B */
45 + case 0x23: /* LNA1 A+B */
46 antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
47 antcomb->first_quick_scan_conf =
48 ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
49 @@ -1327,40 +1327,40 @@ static void ath_ant_div_conf_fast_divbia
50 /* Adjust the fast_div_bias based on main and alt lna conf */
51 switch ((ant_conf->main_lna_conf << 4) |
52 ant_conf->alt_lna_conf) {
53 - case (0x01): /* A-B LNA2 */
54 + case 0x01: /* A-B LNA2 */
55 ant_conf->fast_div_bias = 0x3b;
56 break;
57 - case (0x02): /* A-B LNA1 */
58 + case 0x02: /* A-B LNA1 */
59 ant_conf->fast_div_bias = 0x3d;
60 break;
61 - case (0x03): /* A-B A+B */
62 + case 0x03: /* A-B A+B */
63 ant_conf->fast_div_bias = 0x1;
64 break;
65 - case (0x10): /* LNA2 A-B */
66 + case 0x10: /* LNA2 A-B */
67 ant_conf->fast_div_bias = 0x7;
68 break;
69 - case (0x12): /* LNA2 LNA1 */
70 + case 0x12: /* LNA2 LNA1 */
71 ant_conf->fast_div_bias = 0x2;
72 break;
73 - case (0x13): /* LNA2 A+B */
74 + case 0x13: /* LNA2 A+B */
75 ant_conf->fast_div_bias = 0x7;
76 break;
77 - case (0x20): /* LNA1 A-B */
78 + case 0x20: /* LNA1 A-B */
79 ant_conf->fast_div_bias = 0x6;
80 break;
81 - case (0x21): /* LNA1 LNA2 */
82 + case 0x21: /* LNA1 LNA2 */
83 ant_conf->fast_div_bias = 0x0;
84 break;
85 - case (0x23): /* LNA1 A+B */
86 + case 0x23: /* LNA1 A+B */
87 ant_conf->fast_div_bias = 0x6;
88 break;
89 - case (0x30): /* A+B A-B */
90 + case 0x30: /* A+B A-B */
91 ant_conf->fast_div_bias = 0x1;
92 break;
93 - case (0x31): /* A+B LNA2 */
94 + case 0x31: /* A+B LNA2 */
95 ant_conf->fast_div_bias = 0x3b;
96 break;
97 - case (0x32): /* A+B LNA1 */
98 + case 0x32: /* A+B LNA1 */
99 ant_conf->fast_div_bias = 0x3d;
100 break;
101 default:
102 @@ -1370,22 +1370,22 @@ static void ath_ant_div_conf_fast_divbia
103 /* Adjust the fast_div_bias based on main and alt_lna_conf */
104 switch ((ant_conf->main_lna_conf << 4) |
105 ant_conf->alt_lna_conf) {
106 - case (0x01): /* A-B LNA2 */
107 + case 0x01: /* A-B LNA2 */
108 ant_conf->fast_div_bias = 0x1;
109 ant_conf->main_gaintb = 0;
110 ant_conf->alt_gaintb = 0;
111 break;
112 - case (0x02): /* A-B LNA1 */
113 + case 0x02: /* A-B LNA1 */
114 ant_conf->fast_div_bias = 0x1;
115 ant_conf->main_gaintb = 0;
116 ant_conf->alt_gaintb = 0;
117 break;
118 - case (0x03): /* A-B A+B */
119 + case 0x03: /* A-B A+B */
120 ant_conf->fast_div_bias = 0x1;
121 ant_conf->main_gaintb = 0;
122 ant_conf->alt_gaintb = 0;
123 break;
124 - case (0x10): /* LNA2 A-B */
125 + case 0x10: /* LNA2 A-B */
126 if (!(antcomb->scan) &&
127 (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
128 ant_conf->fast_div_bias = 0x1;
129 @@ -1394,12 +1394,12 @@ static void ath_ant_div_conf_fast_divbia
130 ant_conf->main_gaintb = 0;
131 ant_conf->alt_gaintb = 0;
132 break;
133 - case (0x12): /* LNA2 LNA1 */
134 + case 0x12: /* LNA2 LNA1 */
135 ant_conf->fast_div_bias = 0x1;
136 ant_conf->main_gaintb = 0;
137 ant_conf->alt_gaintb = 0;
138 break;
139 - case (0x13): /* LNA2 A+B */
140 + case 0x13: /* LNA2 A+B */
141 if (!(antcomb->scan) &&
142 (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
143 ant_conf->fast_div_bias = 0x1;
144 @@ -1408,7 +1408,7 @@ static void ath_ant_div_conf_fast_divbia
145 ant_conf->main_gaintb = 0;
146 ant_conf->alt_gaintb = 0;
147 break;
148 - case (0x20): /* LNA1 A-B */
149 + case 0x20: /* LNA1 A-B */
150 if (!(antcomb->scan) &&
151 (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
152 ant_conf->fast_div_bias = 0x1;
153 @@ -1417,12 +1417,12 @@ static void ath_ant_div_conf_fast_divbia
154 ant_conf->main_gaintb = 0;
155 ant_conf->alt_gaintb = 0;
156 break;
157 - case (0x21): /* LNA1 LNA2 */
158 + case 0x21: /* LNA1 LNA2 */
159 ant_conf->fast_div_bias = 0x1;
160 ant_conf->main_gaintb = 0;
161 ant_conf->alt_gaintb = 0;
162 break;
163 - case (0x23): /* LNA1 A+B */
164 + case 0x23: /* LNA1 A+B */
165 if (!(antcomb->scan) &&
166 (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
167 ant_conf->fast_div_bias = 0x1;
168 @@ -1431,17 +1431,17 @@ static void ath_ant_div_conf_fast_divbia
169 ant_conf->main_gaintb = 0;
170 ant_conf->alt_gaintb = 0;
171 break;
172 - case (0x30): /* A+B A-B */
173 + case 0x30: /* A+B A-B */
174 ant_conf->fast_div_bias = 0x1;
175 ant_conf->main_gaintb = 0;
176 ant_conf->alt_gaintb = 0;
177 break;
178 - case (0x31): /* A+B LNA2 */
179 + case 0x31: /* A+B LNA2 */
180 ant_conf->fast_div_bias = 0x1;
181 ant_conf->main_gaintb = 0;
182 ant_conf->alt_gaintb = 0;
183 break;
184 - case (0x32): /* A+B LNA1 */
185 + case 0x32: /* A+B LNA1 */
186 ant_conf->fast_div_bias = 0x1;
187 ant_conf->main_gaintb = 0;
188 ant_conf->alt_gaintb = 0;
189 @@ -1449,9 +1449,7 @@ static void ath_ant_div_conf_fast_divbia
190 default:
191 break;
192 }
193 -
194 }
195 -
196 }
197
198 /* Antenna diversity and combining */