kernel: merge a softirq performance improvement patch

[openwrt/staging/dedeckeh.git] / package / network / services / hostapd / files / netifd.sh

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 005112d828e4865a1010bea37ef36cc549b43d38..e6b0b0d769c6301f05696d4ca963241c3ac11620 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -186,7 +186,7 @@ hostapd_set_bss_options() {
                wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
                wps_device_type wps_device_name wps_manufacturer wps_pin \
                macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
-               iapp_interface eapol_version
+               iapp_interface eapol_version acct_server acct_secret acct_port
 
        set_default isolate 0
        set_default maxassoc 0
@@ -197,6 +197,7 @@ hostapd_set_bss_options() {
        set_default wmm 1
        set_default uapsd 1
        set_default eapol_version 0
+       set_default acct_port 1813
 
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
@@ -221,6 +222,13 @@ hostapd_set_bss_options() {
                [ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
        }
 
+       [ -n "$acct_server" ] && {
+               append bss_conf "acct_server_addr=$acct_server" "$N"
+               append bss_conf "acct_server_port=$acct_port" "$N"
+               [ -n "$acct_secret" ] && \
+                       append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
+       }
+
        case "$auth_type" in
                none)
                        wps_possible=1
@@ -250,7 +258,6 @@ hostapd_set_bss_options() {
                eap)
                        json_get_vars \
                                auth_server auth_secret auth_port \
-                               acct_server acct_secret acct_port \
                                dae_client dae_secret dae_port \
                                ownip \
                                eap_reauth_period dynamic_vlan \
@@ -263,7 +270,6 @@ hostapd_set_bss_options() {
                        [ -n "$auth_secret" ] || json_get_var auth_secret key
 
                        set_default auth_port 1812
-                       set_default acct_port 1813
                        set_default dae_port 3799
 
                        set_default vlan_naming 1
@@ -272,13 +278,6 @@ hostapd_set_bss_options() {
                        append bss_conf "auth_server_port=$auth_port" "$N"
                        append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
 
-                       [ -n "$acct_server" ] && {
-                               append bss_conf "acct_server_addr=$acct_server" "$N"
-                               append bss_conf "acct_server_port=$acct_port" "$N"
-                               [ -n "$acct_secret" ] && \
-                                       append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
-                       }
-
                        [ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
 
                        [ -n "$dae_client" -a -n "$dae_secret" ] && {
@@ -331,8 +330,8 @@ hostapd_set_bss_options() {
        [ -n "$wps_possible" -a -n "$config_methods" ] && {
                set_default ext_registrar 0
                set_default wps_device_type "6-0050F204-1"
-               set_default wps_device_name "OpenWrt AP"
-               set_default wps_manufacturer "openwrt.org"
+               set_default wps_device_name "Lede AP"
+               set_default wps_manufacturer "www.lede-project.org"
 
                wps_state=2
                [ -n "$wps_configured" ] && wps_state=1