11diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
22--- a/src/ap/hw_features.c 2022-01-16 15:51:29.000000000 -0500
33+++ b/src/ap/hw_features.c 2022-07-06 22:57:53.007315518 -0500
4- @@ -26 ,6 +26,17 @@
4+ @@ -24 ,6 +24,19 @@
55 #include "beacon.h"
66 #include "hw_features.h"
77
8+ + #ifdef CONFIG_IWLWIFI
89+ static void ieee80211n_do_nothing(struct hostapd_iface *iface)
910+ {
1011+ wpa_printf(MSG_DEBUG,
@@ -16,13 +17,15 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
1617+ static void ieee80211n_scan_channels_5g(struct hostapd_iface *iface,
1718+ struct wpa_driver_scan_params *params);
1819+
20+ + #endif
1921
2022 void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
2123 size_t num_hw_features)
22- @@ -82,6 +93,33 @@
24+ @@ -82,6 +93,35 @@
2325
2426 if (hostapd_drv_none(hapd))
2527 return -1;
28+ + #ifdef CONFIG_IWLWIFI
2629+
2730+
2831+ if (!iface->conf->noscan) {
@@ -50,37 +53,35 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
5053+ }
5154+ }
5255+ }
56+ + #endif
5357 modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags,
5458 &dfs_domain);
5559 if (modes == NULL) {
56-
57- @@ -308,7 +346,6 @@
58- sec_chan);
59- }
60-
61- -
62- static void ieee80211n_check_scan(struct hostapd_iface *iface)
63- {
64- struct wpa_scan_results *scan_res;
65- @@ -517,8 +554,10 @@
66- int ret;
60+ @@ -518,8 +556,15 @@
6761
6862 /* Check that HT40 is used and PRI / SEC switch is allowed */
69- - if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
70- + if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan) {
63+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
64+ + #ifdef CONFIG_IWLWIFI
65+ + iface->conf->noscan) {
7166+ wpa_printf(MSG_DEBUG, "Not scanning due to noscan?");
67+ + return 0;
68+ + }
69+ + #else
70+ iface->conf->noscan)
7271 return 0;
73- + }
72+ + #endif
7473
7574 hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
7675 wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling "
77- @@ -916,7 +954,7 @@
76+ @@ -916,7 +954,11 @@
7877 if (!hostapd_is_usable_edmg(iface))
7978 return 0;
8079
81- - if (!iface->conf->secondary_channel)
80+ + #ifdef CONFIG_IWLWIFI
8281+ if (!iface->conf->secondary_channel || iface->conf->noscan)
82+ + #else
83+ if (!iface->conf->secondary_channel)
84+ + #endif
8385 return 1;
8486
8587 if (hostapd_is_usable_chan(iface, iface->freq +
86-
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?v=4&size=40){kind=avatar}
0 commit comments