wifi-scripts: move no_probe_resp_if_max_sta to wifi-iface

It is a BSS-level option and not radio-level. As such,
move it to wifi-iface and ap.uc.

Signed-off-by: Rany Hany <rany_hany@riseup.net>
Link: https://github.com/openwrt/openwrt/pull/21412
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-device.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-device.json
index 7b907891a034a42d59c35a643717acc0e5c1c34a..0697e65fc19c4a93beb2b3c4981b7f9c0c9f0e2b 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-device.json
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-device.json
@@ -534,10 +534,6 @@
                        "type": "number",
                        "default": 1
                },
-               "no_probe_resp_if_max_sta": {
-                       "description": "Do not answer probe requests if iface_max_num_sta was reached",
-                       "type": "boolean"
-               },
                "noscan": {
                        "description": "Do not scan for overlapping BSSs in HT40+/- mode.",
                        "type": "boolean",

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
index 3761ae134f7bc2cb266a59220bc87269e927e62f..376faef86c503772bacd46882c0ee720a0660ba7 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
@@ -761,6 +761,10 @@
                        "description": "Network Authentication Type",
                        "type": "string"
                },
+               "no_probe_resp_if_max_sta": {
+                       "description": "Do not answer probe requests if iface_max_num_sta was reached",
+                       "type": "boolean"
+               },
                "ocv": {
                        "description": "Operating Channel Validation",
                        "type": "number",

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
index e91f8e4ef9da7f4e906b234722eec5c7c146997c..ff108ffdbbc763e61a62f8899c1741d251ca5c6e 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
@@ -59,7 +59,7 @@ function iface_setup(config) {
                'wds_sta', 'wds_bridge', 'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
                'ocv', 'beacon_prot', 'spp_amsdu', 'multicast_to_unicast', 'preamble', 'proxy_arp', 'per_sta_vif', 'mbo',
                'bss_transition', 'wnm_sleep_mode', 'wnm_sleep_mode_no_keys', 'qos_map_set', 'max_listen_int',
-               'dtim_period', 'wmm_enabled', 'start_disabled', 'na_mcast_to_ucast',
+               'dtim_period', 'wmm_enabled', 'start_disabled', 'na_mcast_to_ucast', 'no_probe_resp_if_max_sta',
        ]);
 }
 

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
index bf8fe234e1bb154474288bc759a11d6fc47e084a..33eaa0ee15a062ae4b8eeefbf3094d27ad25421b 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
@@ -489,7 +489,7 @@ function generate(config) {
                append_vars(config, [ 'airtime_mode' ]);
 
        /* assoc/thresholds */
-       append_vars(config, [ 'rssi_reject_assoc_rssi', 'rssi_reject_assoc_timeout', 'rssi_ignore_probe_request', 'iface_max_num_sta', 'no_probe_resp_if_max_sta' ]);
+       append_vars(config, [ 'rssi_reject_assoc_rssi', 'rssi_reject_assoc_timeout', 'rssi_ignore_probe_request', 'iface_max_num_sta' ]);
 
        /* ACS / Radar*/
        if (!phy_features.radar_background || config.band != '5g')