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 | 55c322dc683642ad19ec51762b763e7544fe3430 (patch) | |
| tree | fe100267d5a40be1dd4ff0fdb7a170f98fb5416d | |
| parent | 5d37f15006763148f5075a0ee83d626305d05015 (diff) | |
| download | upstream-55c322dc683642ad19ec51762b763e7544fe3430.tar.gz upstream-55c322dc683642ad19ec51762b763e7544fe3430.tar.bz2 upstream-55c322dc683642ad19ec51762b763e7544fe3430.zip | |
hostapd: fix ap/sta regression which got accidentally introduced by r32829 (#11914)
SVN-Revision: 33053
| -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"} |