From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 30 Jul 2018 13:00:53 +0000 (+0200)
Subject: ath10k-ct: fix build with current mac80211 package
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3083962dd409360059199753bb465427c667daf5;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/package/kernel/ath10k-ct/patches/100-kernel_compat.patch b/package/kernel/ath10k-ct/patches/100-kernel_compat.patch
index beb0abf6d12b..b2ec10bb615d 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;