Changeset 41872


Ignore:
Timestamp:
2014-07-29T11:48:02+02:00 (4 years ago)
Author:
jow
Message:

hostapd: Reintroduce Full Dynamic VLAN support

This patch brings full dynamic vlan support to netifd that existed in hostapd.sh in Attitude Adjustment.

Signed-off-by: Joseph CG Walker <Joe@…>
[jow@…: changed commit message, rebased on top of current hostapd.sh]
Signed-off-by: Jo-Philipp Wich <jow@…>

Location:
trunk/package/network/services/hostapd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/hostapd/Makefile

    r41022 r41872  
    11# 
    2 # Copyright (C) 2006-2012 OpenWrt.org 
     2# Copyright (C) 2006-2014 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=hostapd 
    11 PKG_VERSION:=2014-06-03 
     11PKG_VERSION:=2014-07-29 
    1212PKG_RELEASE:=1 
    1313PKG_REV:=84df167554569af8c87f0a8ac1fb508192417d8e 
  • trunk/package/network/services/hostapd/files/netifd.sh

    r41665 r41872  
    130130        config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd 
    131131 
     132        config_add_int dynamic_vlan vlan_naming 
     133        config_add_string vlan_tagged_interface 
     134 
    132135        config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey' 
    133136 
     
    216219                                dae_client dae_secret dae_port \ 
    217220                                nasid iapp_interface ownip \ 
    218                                 eap_reauth_period 
     221                                eap_reauth_period dynamic_vlan \ 
     222                                vlan_tagged_interface 
    219223 
    220224                        # legacy compatibility 
     
    226230                        set_default acct_port 1813 
    227231                        set_default dae_port 3799 
     232 
     233                        set_default vlan_naming 1 
    228234 
    229235                        append bss_conf "auth_server_addr=$auth_server" "$N" 
     
    250256                        append bss_conf "ieee8021x=1" "$N" 
    251257                        append bss_conf "wpa_key_mgmt=WPA-EAP" "$N" 
     258 
     259                        [ -n "$dynamic_vlan" ] && { 
     260                                append bss_conf "dynamic_vlan=$dynamic_vlan" "$N" 
     261                                append bss_conf "vlan_naming=$vlan_naming" "$N" 
     262                                [ -n "$vlan_tagged_interface" ] && \ 
     263                                        append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N" 
     264                        } 
    252265                ;; 
    253266                wep) 
Note: See TracChangeset for help on using the changeset viewer.