domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hostapd: cleanup IBSS-RSN

Browse Source 
set noscan also for IBSS and remove redundant/obsolete variable.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 702c70264b)
This commit is contained in:
Daniel Golle
2020-01-16 10:13:51 +02:00
parent dd4d49dcc1
commit 455ba76bf9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/hostapd/Makefile
View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

6
package/network/services/hostapd/files/hostapd.sh
View File

@@ -704,12 +704,9 @@ wpa_supplicant_prepare_interface() {
local ap_scan= local ap_scan=
_w_mode="$mode" _w_mode="$mode"
_w_modestr=
[[ "$mode" = adhoc ]] && { [[ "$mode" = adhoc ]] && {
ap_scan="ap_scan=2" ap_scan="ap_scan=2"
_w_modestr="mode=1"
} }
local country_str= local country_str=
@@ -790,6 +787,7 @@ wpa_supplicant_add_network() {
[[ "$_w_mode" = "adhoc" ]] && { [[ "$_w_mode" = "adhoc" ]] && {
append network_data "mode=1" "$N$T" append network_data "mode=1" "$N$T"
[ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
[ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
scan_ssid="scan_ssid=0" scan_ssid="scan_ssid=0"
@@ -809,8 +807,6 @@ wpa_supplicant_add_network() {
scan_ssid="" scan_ssid=""
} }
[ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ] && append network_data "$_w_modestr" "$N$T"
[ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T" [ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
case "$auth_type" in case "$auth_type" in