201 lines
6.4 KiB
Diff
201 lines
6.4 KiB
Diff
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
|
|
index d0af2f2..99f55b3 100644
|
|
--- a/drivers/net/wireless/ath/ath9k/recv.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/recv.c
|
|
@@ -1076,39 +1076,39 @@ static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
|
|
antcomb->rssi_lna1 = main_rssi_avg;
|
|
|
|
switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
|
|
- case (0x10): /* LNA2 A-B */
|
|
+ case 0x10: /* LNA2 A-B */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
|
|
break;
|
|
- case (0x20): /* LNA1 A-B */
|
|
+ case 0x20: /* LNA1 A-B */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
|
|
break;
|
|
- case (0x21): /* LNA1 LNA2 */
|
|
+ case 0x21: /* LNA1 LNA2 */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
antcomb->second_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
break;
|
|
- case (0x12): /* LNA2 LNA1 */
|
|
+ case 0x12: /* LNA2 LNA1 */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
antcomb->second_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
break;
|
|
- case (0x13): /* LNA2 A+B */
|
|
+ case 0x13: /* LNA2 A+B */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
|
|
break;
|
|
- case (0x23): /* LNA1 A+B */
|
|
+ case 0x23: /* LNA1 A+B */
|
|
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
|
|
antcomb->first_quick_scan_conf =
|
|
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
|
|
@@ -1325,40 +1325,40 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
/* Adjust the fast_div_bias based on main and alt lna conf */
|
|
switch ((ant_conf->main_lna_conf << 4) |
|
|
ant_conf->alt_lna_conf) {
|
|
- case (0x01): /* A-B LNA2 */
|
|
+ case 0x01: /* A-B LNA2 */
|
|
ant_conf->fast_div_bias = 0x3b;
|
|
break;
|
|
- case (0x02): /* A-B LNA1 */
|
|
+ case 0x02: /* A-B LNA1 */
|
|
ant_conf->fast_div_bias = 0x3d;
|
|
break;
|
|
- case (0x03): /* A-B A+B */
|
|
+ case 0x03: /* A-B A+B */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
break;
|
|
- case (0x10): /* LNA2 A-B */
|
|
+ case 0x10: /* LNA2 A-B */
|
|
ant_conf->fast_div_bias = 0x7;
|
|
break;
|
|
- case (0x12): /* LNA2 LNA1 */
|
|
+ case 0x12: /* LNA2 LNA1 */
|
|
ant_conf->fast_div_bias = 0x2;
|
|
break;
|
|
- case (0x13): /* LNA2 A+B */
|
|
+ case 0x13: /* LNA2 A+B */
|
|
ant_conf->fast_div_bias = 0x7;
|
|
break;
|
|
- case (0x20): /* LNA1 A-B */
|
|
+ case 0x20: /* LNA1 A-B */
|
|
ant_conf->fast_div_bias = 0x6;
|
|
break;
|
|
- case (0x21): /* LNA1 LNA2 */
|
|
+ case 0x21: /* LNA1 LNA2 */
|
|
ant_conf->fast_div_bias = 0x0;
|
|
break;
|
|
- case (0x23): /* LNA1 A+B */
|
|
+ case 0x23: /* LNA1 A+B */
|
|
ant_conf->fast_div_bias = 0x6;
|
|
break;
|
|
- case (0x30): /* A+B A-B */
|
|
+ case 0x30: /* A+B A-B */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
break;
|
|
- case (0x31): /* A+B LNA2 */
|
|
+ case 0x31: /* A+B LNA2 */
|
|
ant_conf->fast_div_bias = 0x3b;
|
|
break;
|
|
- case (0x32): /* A+B LNA1 */
|
|
+ case 0x32: /* A+B LNA1 */
|
|
ant_conf->fast_div_bias = 0x3d;
|
|
break;
|
|
default:
|
|
@@ -1368,22 +1368,22 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
/* Adjust the fast_div_bias based on main and alt_lna_conf */
|
|
switch ((ant_conf->main_lna_conf << 4) |
|
|
ant_conf->alt_lna_conf) {
|
|
- case (0x01): /* A-B LNA2 */
|
|
+ case 0x01: /* A-B LNA2 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x02): /* A-B LNA1 */
|
|
+ case 0x02: /* A-B LNA1 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x03): /* A-B A+B */
|
|
+ case 0x03: /* A-B A+B */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x10): /* LNA2 A-B */
|
|
+ case 0x10: /* LNA2 A-B */
|
|
if (!(antcomb->scan) &&
|
|
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
|
|
ant_conf->fast_div_bias = 0x1;
|
|
@@ -1392,12 +1392,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x12): /* LNA2 LNA1 */
|
|
+ case 0x12: /* LNA2 LNA1 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x13): /* LNA2 A+B */
|
|
+ case 0x13: /* LNA2 A+B */
|
|
if (!(antcomb->scan) &&
|
|
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
|
|
ant_conf->fast_div_bias = 0x1;
|
|
@@ -1406,7 +1406,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x20): /* LNA1 A-B */
|
|
+ case 0x20: /* LNA1 A-B */
|
|
if (!(antcomb->scan) &&
|
|
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
|
|
ant_conf->fast_div_bias = 0x1;
|
|
@@ -1415,12 +1415,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x21): /* LNA1 LNA2 */
|
|
+ case 0x21: /* LNA1 LNA2 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x23): /* LNA1 A+B */
|
|
+ case 0x23: /* LNA1 A+B */
|
|
if (!(antcomb->scan) &&
|
|
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
|
|
ant_conf->fast_div_bias = 0x1;
|
|
@@ -1429,17 +1429,17 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x30): /* A+B A-B */
|
|
+ case 0x30: /* A+B A-B */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x31): /* A+B LNA2 */
|
|
+ case 0x31: /* A+B LNA2 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
break;
|
|
- case (0x32): /* A+B LNA1 */
|
|
+ case 0x32: /* A+B LNA1 */
|
|
ant_conf->fast_div_bias = 0x1;
|
|
ant_conf->main_gaintb = 0;
|
|
ant_conf->alt_gaintb = 0;
|
|
@@ -1447,9 +1447,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
|
|
default:
|
|
break;
|
|
}
|
|
-
|
|
}
|
|
-
|
|
}
|
|
|
|
/* Antenna diversity and combining */
|
|
|