aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-30 15:00:53 +0200
committerJo-Philipp Wich <jo@mein.io>2018-07-30 15:03:44 +0200
commit3083962dd409360059199753bb465427c667daf5 (patch)
tree917125f76ee4782a4e45c20ee4769e1527efae9a
parent4dfa6b7a300188db2d97a291f9c1303286a6bcc5 (diff)
downloadupstream-3083962dd409360059199753bb465427c667daf5.tar.gz
upstream-3083962dd409360059199753bb465427c667daf5.tar.bz2
upstream-3083962dd409360059199753bb465427c667daf5.zip
ath10k-ct: fix build with current mac80211 package
Commit 2dcd955aea ("mac80211: backport and update patches for ath10k") changed the DFS detector API, causing ath10k-ct to fail building due to a missing add_pulse() argument. Extend the already existing kernel compatibility patch to also adjust the add_pulse() call accordingly. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/kernel/ath10k-ct/patches/100-kernel_compat.patch19
1 files changed, 15 insertions, 4 deletions
diff --git a/package/kernel/ath10k-ct/patches/100-kernel_compat.patch b/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
index beb0abf6d1..b2ec10bb61 100644
--- a/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
+++ b/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
@@ -46,7 +46,7 @@
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,
-@@ -8938,7 +8938,7 @@ int ath10k_mac_register(struct ath10k *a
+@@ -8939,7 +8939,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;
@@ -55,7 +55,7 @@
/* Init ath dfs pattern detector */
ar->ath_common.debug_mask = ATH_DBG_DFS;
ar->dfs_detector = dfs_pattern_detector_init(&ar->ath_common,
-@@ -8983,7 +8983,7 @@ err_unregister:
+@@ -8984,7 +8984,7 @@ err_unregister:
ieee80211_unregister_hw(ar->hw);
err_dfs_detector_exit:
@@ -64,7 +64,7 @@
ar->dfs_detector->exit(ar->dfs_detector);
err_free:
-@@ -8998,7 +8998,7 @@ void ath10k_mac_unregister(struct ath10k
+@@ -8999,7 +8999,7 @@ void ath10k_mac_unregister(struct ath10k
{
ieee80211_unregister_hw(ar->hw);
@@ -86,7 +86,7 @@
hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev,
--- a/ath10k/wmi.c
+++ b/ath10k/wmi.c
-@@ -3883,7 +3883,7 @@ void ath10k_wmi_event_dfs(struct ath10k
+@@ -3903,7 +3903,7 @@ void ath10k_wmi_event_dfs(struct ath10k
phyerr->tsf_timestamp, tsf, buf_len);
/* Skip event if DFS disabled */
@@ -95,3 +95,14 @@
return;
ATH10K_DFS_STAT_INC(ar, pulses_total);
+--- a/ath10k-4.13/wmi.c
++++ b/ath10k-4.13/wmi.c
+@@ -3990,7 +3990,7 @@ static void ath10k_dfs_radar_report(stru
+
+ ATH10K_DFS_STAT_INC(ar, pulses_detected);
+
+- if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe)) {
++ if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe, NULL)) {
+ ath10k_dbg(ar, ATH10K_DBG_REGULATORY,
+ "dfs no pulse pattern detected, yet\n");
+ return;