From: John Crispin <john@openwrt.org>
Date: Mon, 1 Dec 2014 16:15:20 +0000 (+0000)
Subject: hostapd: improve 802.1x dynamic vlan support with bridge names
X-Git-Tag: reboot~5156
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d40842d1801e65156d27d727d4fba4735728a844;p=openwrt%2Fstaging%2Fxback.git

hostapd: improve 802.1x dynamic vlan support with bridge names

In r41872 and r42787 Dynamic VLAN support was reintroduced, but the vlan_bridge
parameter is not read while setting up the config, so the default is used which
is undesirable for some uses.

Signed-off-by: Ben Franske <ben.mm@franske.com>

SVN-Revision: 43473
---

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index b1036be7a0..78c8aa7dd2 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -130,7 +130,7 @@ hostapd_common_add_bss_config() {
 	config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
 
 	config_add_int dynamic_vlan vlan_naming
-	config_add_string vlan_tagged_interface
+	config_add_string vlan_tagged_interface vlan_bridge
 
 	config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
 
@@ -226,7 +226,8 @@ hostapd_set_bss_options() {
 				dae_client dae_secret dae_port \
 				nasid ownip \
 				eap_reauth_period dynamic_vlan \
-				vlan_naming vlan_tagged_interface
+				vlan_naming vlan_tagged_interface \
+				vlan_bridge
 
 			# legacy compatibility
 			[ -n "$auth_server" ] || json_get_var auth_server server
@@ -266,6 +267,8 @@ hostapd_set_bss_options() {
 			[ -n "$dynamic_vlan" ] && {
 				append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
 				append bss_conf "vlan_naming=$vlan_naming" "$N"
+				[ -n "$vlan_bridge" ] && \
+					append bss_conf "vlan_bridge=$vlan_bridge" "$N"
 				[ -n "$vlan_tagged_interface" ] && \
 					append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
 			}