AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/ath/ath9k/hw.c
..
..
@@ -457,7 +457,7 @@
457
457
 	struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
458
458
 
459
459
 	regulatory->country_code = CTRY_DEFAULT;
460
-	regulatory->power_limit = MAX_RATE_POWER;
460
+	regulatory->power_limit = MAX_COMBINED_POWER;
461
461
 
462
462
 	ah->hw_version.magic = AR5416_MAGIC;
463
463
 	ah->hw_version.subvendorid = 0;
..
..
@@ -1277,12 +1277,12 @@
1277
1277
 			REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
1278
1278
 			break;
1279
1279
 		}
1280
-		/* fall through */
1280
+		fallthrough;
1281
1281
 	case NL80211_IFTYPE_OCB:
1282
1282
 	case NL80211_IFTYPE_MESH_POINT:
1283
1283
 	case NL80211_IFTYPE_AP:
1284
1284
 		set |= AR_STA_ID1_STA_AP;
1285
-		/* fall through */
1285
+		fallthrough;
1286
1286
 	case NL80211_IFTYPE_STATION:
1287
1287
 		REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
1288
1288
 		break;
..
..
@@ -2292,6 +2292,7 @@
2292
2292
 	case NL80211_IFTYPE_ADHOC:
2293
2293
 		REG_SET_BIT(ah, AR_TXCFG,
2294
2294
 			    AR_TXCFG_ADHOC_BEACON_ATIM_TX_POLICY);
2295
+		fallthrough;
2295
2296
 	case NL80211_IFTYPE_MESH_POINT:
2296
2297
 	case NL80211_IFTYPE_AP:
2297
2298
 		REG_WRITE(ah, AR_NEXT_TBTT_TIMER, next_beacon);
..
..
@@ -2408,7 +2409,7 @@
2408
2409
  * of tests. The testing requirements are going to be documented. Desired
2409
2410
  * test requirements are documented at:
2410
2411
  *
2411
- * http://wireless.kernel.org/en/users/Drivers/ath9k/dfs
2412
+ * https://wireless.wiki.kernel.org/en/users/Drivers/ath9k/dfs
2412
2413
  *
2413
2414
  * Once a new chipset gets properly tested an individual commit can be used
2414
2415
  * to document the testing for DFS for that chipset.
..
..
@@ -2967,7 +2968,7 @@
2967
2968
 		ctl = ath9k_regd_get_ctl(reg, chan);
2968
2969
 
2969
2970
 	channel = chan->chan;
2970
-	chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
2971
+	chan_pwr = min_t(int, channel->max_power * 2, MAX_COMBINED_POWER);
2971
2972
 	new_pwr = min_t(int, chan_pwr, reg->power_limit);
2972
2973
 
2973
2974
 	ah->eep_ops->set_txpower(ah, chan, ctl,
..
..
@@ -2980,9 +2981,9 @@
2980
2981
 	struct ath9k_channel *chan = ah->curchan;
2981
2982
 	struct ieee80211_channel *channel = chan->chan;
2982
2983
 
2983
-	reg->power_limit = min_t(u32, limit, MAX_RATE_POWER);
2984
+	reg->power_limit = min_t(u32, limit, MAX_COMBINED_POWER);
2984
2985
 	if (test)
2985
-		channel->max_power = MAX_RATE_POWER / 2;
2986
+		channel->max_power = MAX_COMBINED_POWER / 2;
2986
2987
 
2987
2988
 	ath9k_hw_apply_txpower(ah, chan, test);
2988
2989