hostapd: cleanup IBSS-RSN

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

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 702c70264b388c2b47e171843f297f43c71b86b9)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 4f6420f503ccf7475dfa9ffd46f8cd98416c88fc..86534054b850855db5f66407b6f6d48f6153934b 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
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
 
 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 3c1504ca60beb601080032d33449d61fa1bc8ba1..79e71616dcfd5af0d2396ed1db2202836c80c3f0 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -704,12 +704,9 @@ wpa_supplicant_prepare_interface() {
        local ap_scan=
 
        _w_mode="$mode"
        local ap_scan=
 
        _w_mode="$mode"

-       _w_modestr=

 
        [[ "$mode" = adhoc ]] && {
                ap_scan="ap_scan=2"
 
        [[ "$mode" = adhoc ]] && {
                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" ]] && {
                append network_data "mode=1" "$N$T"
                [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
        [[ "$_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"
 
 
                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"
 
        case "$auth_type" in
        [ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
 
        case "$auth_type" in