ath10k-ct: fix kernel api compatibility issues

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/kernel/ath10k-ct/patches/100-kernel_compat.patch b/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
new file mode 100644 (file)
index 0000000..5d363a0
--- /dev/null
+++ b/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
@@ -0,0 +1,97 @@
+--- a/ath10k/debug.c
++++ b/ath10k/debug.c
+@@ -166,11 +166,11 @@ void ath10k_debug_print_hwfw_info(struct
+                   ar->id.subsystem_vendor, ar->id.subsystem_device);
+ 
+       ath10k_info(ar, "kconfig debug %d debugfs %d tracing %d dfs %d testmode %d\n",
+-                  config_enabled(CONFIG_ATH10K_DEBUG),
+-                  config_enabled(CONFIG_ATH10K_DEBUGFS),
+-                  config_enabled(CONFIG_ATH10K_TRACING),
+-                  config_enabled(CONFIG_ATH10K_DFS_CERTIFIED),
+-                  config_enabled(CONFIG_NL80211_TESTMODE));
++                  IS_ENABLED(CONFIG_ATH10K_DEBUG),
++                  IS_ENABLED(CONFIG_ATH10K_DEBUGFS),
++                  IS_ENABLED(CONFIG_ATH10K_TRACING),
++                  IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED),
++                  IS_ENABLED(CONFIG_NL80211_TESTMODE));
+ 
+       firmware = ar->normal_mode_fw.fw_file.firmware;
+       if (firmware)
+@@ -3397,7 +3397,7 @@ int ath10k_debug_register(struct ath10k
+       debugfs_create_file("nf_cal_period", S_IRUSR | S_IWUSR,
+                           ar->debug.debugfs_phy, ar, &fops_nf_cal_period);
+ 
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) {
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) {
+               debugfs_create_file("dfs_simulate_radar", S_IWUSR,
+                                   ar->debug.debugfs_phy, ar,
+                                   &fops_simulate_radar);
+--- a/ath10k/mac.c
++++ b/ath10k/mac.c
+@@ -3556,7 +3556,7 @@ static void ath10k_regd_update(struct at
+ 
+       regpair = ar->ath_common.regulatory.regpair;
+ 
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
+               nl_dfs_reg = ar->dfs_detector->region;
+               wmi_dfs_reg = ath10k_mac_get_dfs_region(nl_dfs_reg);
+               ath10k_dbg(ar, ATH10K_DBG_REGULATORY,
+@@ -3590,7 +3590,7 @@ static void ath10k_reg_notifier(struct w
+ 
+       ath_reg_notifier_apply(wiphy, request, &ar->ath_common.regulatory);
+ 
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
+               ath10k_dbg(ar, ATH10K_DBG_REGULATORY, "reg-notifier: dfs region 0x%x\n",
+                          request->dfs_region);
+               result = ar->dfs_detector->set_dfs_domain(ar->dfs_detector,
+@@ -8863,7 +8863,7 @@ int ath10k_mac_register(struct ath10k *a
+       if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
+               ar->hw->netdev_features = NETIF_F_HW_CSUM;
+ 
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) {
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) {
+               /* Init ath dfs pattern detector */
+               ar->ath_common.debug_mask = ATH_DBG_DFS;
+               ar->dfs_detector = dfs_pattern_detector_init(&ar->ath_common,
+@@ -8908,7 +8908,7 @@ err_unregister:
+       ieee80211_unregister_hw(ar->hw);
+ 
+ err_dfs_detector_exit:
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
+               ar->dfs_detector->exit(ar->dfs_detector);
+ 
+ err_free:
+@@ -8923,7 +8923,7 @@ void ath10k_mac_unregister(struct ath10k
+ {
+       ieee80211_unregister_hw(ar->hw);
+ 
+-      if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
++      if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
+               ar->dfs_detector->exit(ar->dfs_detector);
+ 
+       kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels);
+--- a/ath10k/thermal.c
++++ b/ath10k/thermal.c
+@@ -192,7 +192,7 @@ int ath10k_thermal_register(struct ath10
+ 
+       /* Avoid linking error on devm_hwmon_device_register_with_groups, I
+        * guess linux/hwmon.h is missing proper stubs. */
+-      if (!config_enabled(CONFIG_HWMON))
++      if (!IS_ENABLED(CONFIG_HWMON))
+               return 0;
+ 
+       hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev,
+--- a/ath10k/wmi.c
++++ b/ath10k/wmi.c
+@@ -3788,7 +3788,7 @@ void ath10k_wmi_event_dfs(struct ath10k
+                  phyerr->tsf_timestamp, tsf, buf_len);
+ 
+       /* Skip event if DFS disabled */
+-      if (!config_enabled(CONFIG_ATH10K_DFS_CERTIFIED))
++      if (!IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED))
+               return;
+ 
+       ATH10K_DFS_STAT_INC(ar, pulses_total);

diff --git a/package/kernel/ath10k-ct/patches/110-api_fix.patch b/package/kernel/ath10k-ct/patches/110-api_fix.patch
new file mode 100644 (file)
index 0000000..4c21036
--- /dev/null
+++ b/package/kernel/ath10k-ct/patches/110-api_fix.patch
@@ -0,0 +1,11 @@
+--- a/ath10k/htt_rx.c
++++ b/ath10k/htt_rx.c
+@@ -2490,7 +2490,7 @@ bool ath10k_htt_t2h_msg_handler(struct a
+               u32 freq = __le32_to_cpu(resp->chan_change.freq);
+ 
+               ar->tgt_oper_chan =
+-                      __ieee80211_get_channel(ar->hw->wiphy, freq);
++                      ieee80211_get_channel(ar->hw->wiphy, freq);
+               ath10k_dbg(ar, ATH10K_DBG_HTT,
+                          "htt chan change freq %u phymode %s\n",
+                          freq, ath10k_wmi_phymode_str(phymode));