diff options
| author | John Crispin <blogic@openwrt.org> | 2014-12-01 16:15:20 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-12-01 16:15:20 +0000 |
| commit | b040855a9151030a48c198dcebaf061557e7154c (patch) | |
| tree | 1083f17b6d36cc677eb597260d29a3165d69b9b3 /package/network/services | |
| parent | 894af53f0084d8a38b0e42edf061e54b09921db7 (diff) | |
| download | upstream-b040855a9151030a48c198dcebaf061557e7154c.tar.gz upstream-b040855a9151030a48c198dcebaf061557e7154c.tar.bz2 upstream-b040855a9151030a48c198dcebaf061557e7154c.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43473 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services')
| -rw-r--r-- | package/network/services/hostapd/files/netifd.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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" } |