| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119 |
- --- 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)
- @@ -3422,7 +3422,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
- @@ -3604,7 +3604,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,
- @@ -3638,7 +3638,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,
- @@ -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;
-
- - 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,
- @@ -8984,7 +8984,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:
- @@ -8999,7 +8999,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
- @@ -3903,7 +3903,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);
- --- a/ath10k-4.13/wmi.c
- +++ b/ath10k-4.13/wmi.c
- @@ -4031,7 +4031,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;
- --- a/ath10k-4.16/wmi.c
- +++ b/ath10k-4.16/wmi.c
- @@ -4061,7 +4061,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;
|
