diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2012-08-08 11:13:12 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-08-08 11:13:12 +0000 |
commit | 8e7bd7eb2e78e47734ac2a0347877aa43e39c790 (patch) | |
tree | 8678f5a6ce0406a34127a52bca92276d4be8aeff | |
parent | 1d37d67df3362f2d922d285d08e7492ab3d0538e (diff) | |
download | upstream-8e7bd7eb2e78e47734ac2a0347877aa43e39c790.tar.gz upstream-8e7bd7eb2e78e47734ac2a0347877aa43e39c790.tar.bz2 upstream-8e7bd7eb2e78e47734ac2a0347877aa43e39c790.zip |
[package] hostapd: fix ap/sta regression which got accidentally introduced by r32829 (#11914)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33053 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/hostapd/Makefile | 2 | ||||
-rw-r--r-- | package/hostapd/files/wpa_supplicant.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 4fedd1b937..122ee9b1a4 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd PKG_VERSION:=20120428 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_REV:=1f0cc27eb98f7d1af9c64d0752238184cbdb9a24 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh index babacd7968..5c4bd93d02 100644 --- a/package/hostapd/files/wpa_supplicant.sh +++ b/package/hostapd/files/wpa_supplicant.sh @@ -127,6 +127,8 @@ wpa_supplicant_setup_vif() { local fixed_freq bssid1 beacon_interval brates mrate config_get ifname "$vif" ifname config_get bridge "$vif" bridge + config_get ssid "$vif" ssid + config_get bssid "$vif" bssid bssid1=${bssid:+"bssid=$bssid"} beacon_interval=${beacon_int:+"beacon_interval=$beacon_int"} |