forked from mirror/openwrt
95c8b385e5
33fb6c738bc4 P2P2: Enable some testing parameters without CONFIG_TESTING_OPTIONS 56616c4183a6 P2P2: Update device name with USD device found 1d791939dcdf Cancel pending connect radio work when network is removed 8235e21d7fe3 P2P: Fix preferred frequency list size handling in p2p_check_pref_chan() 4bc754d9c727 Add QCA vendor interface to enable/disable TX power limit d65f5705df98 Add QCA vendor attribute to disable A-MSDU address check validation 74881765b7fb nl80211: Use i802_bss in qca_set_allowed_ap_freqs() to use correct ifindex ca8303135cbb P2P2: Set P2P mode to the driver on P2P GO device 063ae7af68dc ACS: Fix incorrect index calculation for primary channel 4aa3a58377c1 ACS: Validate all channels in a segment before selection 02c9d3376224 ACS: Extend support to exclude 6 GHz non-PSC in non-offloaded ACS 307365eb57bb tests: Add test for ACS exclude 6 GHz non-PSC 0721e4886316 Add QCA vendor attribute to configure EHT RTWT support 76b39db44c77 QCA vendor attribute to configure BTM MLD Recommendation For Multiple APs support 2faeffdeca22 AP MLD: Properly deinit sm of non-ML STA connected to ML AP e4f4e5a872a5 AP MLD: Fix STA's flag wrongly updated in SME-in-driver cases ec6cade42c0f Increase buffer size to handle long freq_list entries in config 0522585da7b0 Write freq_list as per-network item in wpa_supplicant.conf 5e527704b912 Use SCS reconfiguration logic under CONFIG_NO_ROBUST_AV 5d6214a724c1 PASN: Clear driver/firwmare ranging context if PASN Auth 1 fails 14dc782d50db DPP: Avoid generating DPP shared secret(z) for non-association links 40326b60b17a RSNO: Allow OWE to be configured in RSN overrides in AP processing acadef1b04d5 hostapd_cli: Open a new hostapd connection on ping failure when using -a ac0d9bd80ec5 Add QCA vendor attributes to configure global TX chain mask f5b8ef6c966a Add QCA vendor attributes for MSDU TX statistics 6c11fcefe4fc hostapd: Prevent blocking sends on control interface monitor socket 0bbb8a66f64c AP MLD: Remove redundant outer loop in hostapd_notif_disassoc_mld() 52fb5ccd91f3 AP MLD: Avoid using mld_id to identify partners 7bb930d50b5f wpa_supplicant: Add option to disable 80+80 MHz opclass advertisement 9001059bd6ad tests: Make dbus_connect_oom more robust 663fb1940231 AP MLD: Fix hostapd_is_mld_ap() check 590f3bdb4c61 AP MLD: Rename hostapd_is_mld_ap() to hostapd_is_multiple_link_mld() b13b69a235f7 Add VLANID in the AP-STA-CONNECTED events c1e8b1c6462b SAE: Assign VLAN when using PMKSA caching 9bc29dcdfdee SAE: Default password binding through control interface 9de127c31c40 tests: More testing coverage for SAE with multiple passwords 5ce1d4180386 nl80211: Fix crash by cancelling scan timeout before a BSS is removed ca266cc24d87 nl80211: Fix crash by setting the drv->ctx properly Signed-off-by: Felix Fietkau <nbd@nbd.name>
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Fri, 20 Apr 2018 07:41:03 +0200
|
|
Subject: [PATCH] Allow HT40 also on 2.4GHz if noscan option is set, which also
|
|
skips secondary channel scan just like noscan works in AP mode.
|
|
|
|
--- a/wpa_supplicant/config.c
|
|
+++ b/wpa_supplicant/config.c
|
|
@@ -2642,6 +2642,7 @@ static const struct parse_data ssid_fiel
|
|
#else /* CONFIG_MESH */
|
|
{ INT_RANGE(mode, 0, 4) },
|
|
#endif /* CONFIG_MESH */
|
|
+ { INT_RANGE(noscan, 0, 1) },
|
|
{ INT_RANGE(proactive_key_caching, 0, 1) },
|
|
{ INT_RANGE(disabled, 0, 2) },
|
|
{ STR(id_str) },
|
|
--- a/wpa_supplicant/config_file.c
|
|
+++ b/wpa_supplicant/config_file.c
|
|
@@ -869,6 +869,7 @@ static void wpa_config_write_network(FIL
|
|
INT(mode);
|
|
#ifdef CONFIG_MESH
|
|
INT(no_auto_peer);
|
|
+ INT(noscan);
|
|
INT_DEF(mesh_fwding, DEFAULT_MESH_FWDING);
|
|
#endif /* CONFIG_MESH */
|
|
INT(frequency);
|
|
--- a/wpa_supplicant/config_ssid.h
|
|
+++ b/wpa_supplicant/config_ssid.h
|
|
@@ -1071,6 +1071,8 @@ struct wpa_ssid {
|
|
*/
|
|
int no_auto_peer;
|
|
|
|
+ int noscan;
|
|
+
|
|
/**
|
|
* mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
|
|
*
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -538,6 +538,8 @@ static int wpa_supplicant_mesh_init(stru
|
|
frequency);
|
|
goto out_free;
|
|
}
|
|
+ if (conf->noscan)
|
|
+ ssid->noscan = 1;
|
|
|
|
if (ssid->mesh_basic_rates == NULL) {
|
|
/*
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -3048,7 +3048,7 @@ static bool ibss_mesh_can_use_vht(struct
|
|
const struct wpa_ssid *ssid,
|
|
struct hostapd_hw_modes *mode)
|
|
{
|
|
- if (mode->mode != HOSTAPD_MODE_IEEE80211A)
|
|
+ if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
|
|
return false;
|
|
|
|
if (!drv_supports_vht(wpa_s, ssid))
|
|
@@ -3122,7 +3122,7 @@ static void ibss_mesh_select_40mhz(struc
|
|
int i, res;
|
|
unsigned int j;
|
|
static const int ht40plus_5ghz[] = {
|
|
- 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
|
|
+ 1, 2, 3, 4, 5, 6, 7, 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
|
|
149, 157, 165, 173, 184, 192
|
|
};
|
|
static const int ht40plus_6ghz[] = {
|
|
@@ -3475,7 +3475,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
|
int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
|
|
enum hostapd_hw_mode hw_mode;
|
|
struct hostapd_hw_modes *mode = NULL;
|
|
- int obss_scan = 1;
|
|
+ int obss_scan = !(ssid->noscan);
|
|
u8 channel;
|
|
bool is_6ghz, is_24ghz;
|
|
bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
|
|
@@ -3519,6 +3519,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
|
freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
|
|
ieee80211_mode);
|
|
freq->channel = channel;
|
|
+ if (mode->mode == HOSTAPD_MODE_IEEE80211G && ssid->noscan)
|
|
+ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, is_6ghz, dfs_enabled);
|
|
/* Setup higher BW only for 5 and 6 GHz */
|
|
if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
|
|
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan,
|