From 74ea7a7a1e47965732e8deeabb3fcdd77a49d4c9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 29 Nov 2022 14:27:23 +0100 Subject: [PATCH] ucentral-schema: update to latest HEAD efd60c9 add maximum_clients_ignore_probe support Signed-off-by: John Crispin --- feeds/ucentral/ucentral-schema/Makefile | 4 +- feeds/wifi-ax/hostapd/files/hostapd.sh | 5 ++- ...22-hostapd-add-maxassoc_ignore_probe.patch | 43 +++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 patches/wifi/0022-hostapd-add-maxassoc_ignore_probe.patch diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index f90eb1edc..37f8b7df0 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git -PKG_MIRROR_HASH:=c3ea588111b7ca7fbc2f610dd6e57865340b26a8175d5ef6d92cf801148b46fb +PKG_MIRROR_HASH:=311149e7e2476966f90fec6b046ea1126dbd689a6957b20a702a91c43b64d91a PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-05-29 -PKG_SOURCE_VERSION:=74fc62bb06026b06cb2897303de4be5388430594 +PKG_SOURCE_VERSION:=efd60c95b93318a8b70b48239dc85887abb01de3 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/wifi-ax/hostapd/files/hostapd.sh b/feeds/wifi-ax/hostapd/files/hostapd.sh index 8362158cb..fa0dbfb75 100644 --- a/feeds/wifi-ax/hostapd/files/hostapd.sh +++ b/feeds/wifi-ax/hostapd/files/hostapd.sh @@ -117,6 +117,7 @@ hostapd_common_add_device_config() { config_add_int rssi_reject_assoc_rssi config_add_int rssi_ignore_probe_request config_add_int maxassoc + config_add_boolean maxassoc_ignore_probe config_add_string acs_chan_bias config_add_boolean acs_exclude_dfs @@ -138,7 +139,8 @@ hostapd_prepare_device_config() { json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \ acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \ rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \ - multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs + multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs \ + maxassoc_ignore_probe hostapd_set_log_options base_cfg @@ -245,6 +247,7 @@ hostapd_prepare_device_config() { append base_cfg "dtim_period=$dtim_period" "$N" [ "$airtime_mode" -gt 0 ] && append base_cfg "airtime_mode=$airtime_mode" "$N" [ -n "$maxassoc" ] && append base_cfg "iface_max_num_sta=$maxassoc" "$N" + [ "$maxassoc_ignore_probe" -gt 0 ] && append base_cfg "no_probe_resp_if_max_sta=1" "$N" [ "$rnr_beacon" -gt 0 ] && append base_cfg "rnr_beacon=$rnr_beacon" "$N" [ "$he_co_locate" -gt 0 ] && append base_cfg "he_co_locate=$he_co_locate" "$N" [ "$multiple_bssid" -gt 0 ] && append base_cfg "multiple_bssid=$multiple_bssid" "$N" diff --git a/patches/wifi/0022-hostapd-add-maxassoc_ignore_probe.patch b/patches/wifi/0022-hostapd-add-maxassoc_ignore_probe.patch new file mode 100644 index 000000000..11d6e89d6 --- /dev/null +++ b/patches/wifi/0022-hostapd-add-maxassoc_ignore_probe.patch @@ -0,0 +1,43 @@ +From 7a647260b6ec314fe4c52449bb6fe0a39026e9d9 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Tue, 29 Nov 2022 14:29:15 +0100 +Subject: [PATCH] hostapd: add maxassoc_ignore_probe + +Signed-off-by: John Crispin +--- + package/network/services/hostapd/files/hostapd.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh +index 8362158cb0..fa0dbfb754 100644 +--- a/package/network/services/hostapd/files/hostapd.sh ++++ b/package/network/services/hostapd/files/hostapd.sh +@@ -117,6 +117,7 @@ hostapd_common_add_device_config() { + config_add_int rssi_reject_assoc_rssi + config_add_int rssi_ignore_probe_request + config_add_int maxassoc ++ config_add_boolean maxassoc_ignore_probe + + config_add_string acs_chan_bias + config_add_boolean acs_exclude_dfs +@@ -138,7 +139,8 @@ hostapd_prepare_device_config() { + json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \ + acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \ + rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \ +- multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs ++ multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs \ ++ maxassoc_ignore_probe + + hostapd_set_log_options base_cfg + +@@ -245,6 +247,7 @@ hostapd_prepare_device_config() { + append base_cfg "dtim_period=$dtim_period" "$N" + [ "$airtime_mode" -gt 0 ] && append base_cfg "airtime_mode=$airtime_mode" "$N" + [ -n "$maxassoc" ] && append base_cfg "iface_max_num_sta=$maxassoc" "$N" ++ [ "$maxassoc_ignore_probe" -gt 0 ] && append base_cfg "no_probe_resp_if_max_sta=1" "$N" + [ "$rnr_beacon" -gt 0 ] && append base_cfg "rnr_beacon=$rnr_beacon" "$N" + [ "$he_co_locate" -gt 0 ] && append base_cfg "he_co_locate=$he_co_locate" "$N" + [ "$multiple_bssid" -gt 0 ] && append base_cfg "multiple_bssid=$multiple_bssid" "$N" +-- +2.25.1 +