OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 44... Line 44...
44 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) { 44 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
45 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) { 45 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) {
46 ath10k_dbg(ar, ATH10K_DBG_REGULATORY, "reg-notifier: dfs region 0x%x\n", 46 ath10k_dbg(ar, ATH10K_DBG_REGULATORY, "reg-notifier: dfs region 0x%x\n",
47 request->dfs_region); 47 request->dfs_region);
48 result = ar->dfs_detector->set_dfs_domain(ar->dfs_detector, 48 result = ar->dfs_detector->set_dfs_domain(ar->dfs_detector,
49 @@ -8939,7 +8939,7 @@ int ath10k_mac_register(struct ath10k *a 49 @@ -8938,7 +8938,7 @@ int ath10k_mac_register(struct ath10k *a
50 if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) 50 if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
51 ar->hw->netdev_features = NETIF_F_HW_CSUM; 51 ar->hw->netdev_features = NETIF_F_HW_CSUM;
Line 52... Line 52...
52 52
53 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) { 53 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) {
54 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) { 54 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) {
55 /* Init ath dfs pattern detector */ 55 /* Init ath dfs pattern detector */
56 ar->ath_common.debug_mask = ATH_DBG_DFS; 56 ar->ath_common.debug_mask = ATH_DBG_DFS;
57 ar->dfs_detector = dfs_pattern_detector_init(&ar->ath_common, 57 ar->dfs_detector = dfs_pattern_detector_init(&ar->ath_common,
58 @@ -8984,7 +8984,7 @@ err_unregister: 58 @@ -8983,7 +8983,7 @@ err_unregister:
Line 59... Line 59...
59 ieee80211_unregister_hw(ar->hw); 59 ieee80211_unregister_hw(ar->hw);
60 60
61 err_dfs_detector_exit: 61 err_dfs_detector_exit:
62 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) 62 - if (config_enabled(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
Line 63... Line 63...
63 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) 63 + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
64 ar->dfs_detector->exit(ar->dfs_detector); 64 ar->dfs_detector->exit(ar->dfs_detector);
65 65
66 err_free: 66 err_free:
Line 67... Line 67...
67 @@ -8999,7 +8999,7 @@ void ath10k_mac_unregister(struct ath10k 67 @@ -8998,7 +8998,7 @@ void ath10k_mac_unregister(struct ath10k
68 { 68 {
Line 84... Line 84...
84 return 0; 84 return 0;
Line 85... Line 85...
85 85
86 hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev, 86 hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev,
87 --- a/ath10k/wmi.c 87 --- a/ath10k/wmi.c
88 +++ b/ath10k/wmi.c 88 +++ b/ath10k/wmi.c
89 @@ -3903,7 +3903,7 @@ void ath10k_wmi_event_dfs(struct ath10k 89 @@ -3883,7 +3883,7 @@ void ath10k_wmi_event_dfs(struct ath10k
Line 90... Line 90...
90 phyerr->tsf_timestamp, tsf, buf_len); 90 phyerr->tsf_timestamp, tsf, buf_len);
91 91
92 /* Skip event if DFS disabled */ 92 /* Skip event if DFS disabled */
93 - if (!config_enabled(CONFIG_ATH10K_DFS_CERTIFIED)) 93 - if (!config_enabled(CONFIG_ATH10K_DFS_CERTIFIED))
Line 94... Line 94...
94 + if (!IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) 94 + if (!IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED))
95 return; -  
96 -  
97 ATH10K_DFS_STAT_INC(ar, pulses_total); -  
98 --- a/ath10k-4.13/wmi.c -  
99 +++ b/ath10k-4.13/wmi.c -  
100 @@ -4031,7 +4031,7 @@ static void ath10k_dfs_radar_report(stru -  
101 -  
102 ATH10K_DFS_STAT_INC(ar, pulses_detected); -  
103 -  
104 - if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe)) { -  
105 + if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe, NULL)) { -  
106 ath10k_dbg(ar, ATH10K_DBG_REGULATORY, -  
107 "dfs no pulse pattern detected, yet\n"); -  
108 return; -  
109 --- a/ath10k-4.16/wmi.c -  
110 +++ b/ath10k-4.16/wmi.c -  
111 @@ -4065,7 +4065,7 @@ static void ath10k_dfs_radar_report(stru -  
112 -  
113 ATH10K_DFS_STAT_INC(ar, pulses_detected); -  
114 -  
115 - if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe)) { -  
116 + if (!ar->dfs_detector->add_pulse(ar->dfs_detector, &pe, NULL)) { -