aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2020-01-16 10:13:51 +0200
committerDaniel Golle <daniel@makrotopia.org>2020-01-16 17:32:02 +0200
commit455ba76bf9f54d105729daedb17fb8a179793738 (patch)
tree67446f332b01a307967f8d82fbd0abd0069db361 /package/network
parentdd4d49dcc1c7bf641200ac2fc40c604b01fea164 (diff)
downloadupstream-455ba76bf9f54d105729daedb17fb8a179793738.tar.gz
upstream-455ba76bf9f54d105729daedb17fb8a179793738.tar.bz2
upstream-455ba76bf9f54d105729daedb17fb8a179793738.zip
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)
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/hostapd/Makefile2
-rw-r--r--package/network/services/hostapd/files/hostapd.sh6
2 files changed, 2 insertions, 6 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 4f6420f503..86534054b8 100644
--- 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:=1
+PKG_RELEASE:=2
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 3c1504ca60..79e71616dc 100644
--- 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"
- _w_modestr=
[[ "$mode" = adhoc ]] && {
ap_scan="ap_scan=2"
-
- _w_modestr="mode=1"
}
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"
+ [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
scan_ssid="scan_ssid=0"
@@ -809,8 +807,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