hostapd: cleanup IBSS-RSN

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

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index cc06a7abb602973ff12df98ab7d17b835e87c148..231c2c1b886e643bb12d8931fb5bb4928d9fb09c 100644 (file)
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index c1f8e7f0711973460d6eaa4afcbdae433364d80b..b52d305f952ee014b6b804e37142bc0e7b405454 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -729,12 +729,9 @@ wpa_supplicant_prepare_interface() {
        local ap_scan=
 
        _w_mode="$mode"
-       _w_modestr=
 
        [[ "$mode" = adhoc ]] && {
                ap_scan="ap_scan=2"
-
-               _w_modestr="mode=1"
        }
 
        local country_str=
@@ -815,6 +812,7 @@ wpa_supplicant_add_network() {
        [[ "$_w_mode" = "adhoc" ]] && {
                append network_data "mode=1" "$N$T"
                [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+               [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
 
                scan_ssid="scan_ssid=0"
 
@@ -834,8 +832,6 @@ wpa_supplicant_add_network() {
                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"
 
        case "$auth_type" in