KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hostapd: Use network_get_device instead of uci_get_state

Browse source 
This fixes the IAPP functionality.

Signed-off-by: Petko Bordjukov <bordjukov@gmail.com>

SVN-Revision: 47455
This commit is contained in:
Felix Fietkau 2015-11-11 08:34:59 +00:00
parent 2d23fedac5
commit 047f9ef8eb
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/hostapd/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_VERSION:=2015-03-25 PKG_VERSION:=2015-03-25
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_REV:=8278138e679174b1ec8af7f169c2810a8888e202 PKG_REV:=8278138e679174b1ec8af7f169c2810a8888e202
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

9
package/network/services/hostapd/files/hostapd.sh
View file

@ -1,3 +1,5 @@
. /lib/functions/network.sh
hostapd_set_bss_options() { hostapd_set_bss_options() {
local var="$1" local var="$1"
local vif="$2" local vif="$2"
@ -213,7 +215,11 @@ hostapd_set_bss_options() {
append "$var" "ssid=$ssid" "$N" append "$var" "ssid=$ssid" "$N"
[ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N" [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
[ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
[ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" [ -n "$iapp_interface" ] && {
local ifname
network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
append bss_conf "iapp_interface=$ifname" "$N"
}
if [ "$wpa" -ge "1" ] if [ "$wpa" -ge "1" ]
then then
@ -391,4 +397,3 @@ $hostapd_cfg
EOF EOF
hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
} }

7
package/network/services/hostapd/files/netifd.sh
View file

@ -1,3 +1,5 @@
. /lib/functions/network.sh
wpa_supplicant_add_rate() { wpa_supplicant_add_rate() {
local var="$1" local var="$1"
local val="$(($2 / 1000))" local val="$(($2 / 1000))"
@ -351,8 +353,9 @@ hostapd_set_bss_options() {
append bss_conf "ssid=$ssid" "$N" append bss_conf "ssid=$ssid" "$N"
[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N" [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
[ -n "$iapp_interface" ] && { [ -n "$iapp_interface" ] && {
iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")" local ifname
[ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N" network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
append bss_conf "iapp_interface=$ifname" "$N"
} }
if [ "$wpa" -ge "1" ]; then if [ "$wpa" -ge "1" ]; then