[source] hostapd: configure NAS ID regardless of encryption

[LEDE Commits]

jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/0e6a6c84873e8fc9367d0766ced71e0db662e377

commit 0e6a6c84873e8fc9367d0766ced71e0db662e377
Author: Yury Shvedov <yshvedov at wimarksystems.com>
AuthorDate: Tue Jun 27 11:43:54 2017 +0300

    hostapd: configure NAS ID regardless of encryption
    
    RADIUS protocol could be used not only for authentication but for
    accounting too. Accounting could be configured for any type of networks.
    However there is no way to configure NAS Identifier for non-WPA
    networks without this patch.
    
    Signed-off-by: Yury Shvedov <yshvedov at wimarksystems.com>
    [cleanup commit message]
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
    (cherry picked from commit 37c1513b1f98c93bf84bbcedd9782568e7d4abba)
---
 package/network/services/hostapd/files/hostapd.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index d42b6a0..9ad7610 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -212,7 +212,7 @@ hostapd_set_bss_options() {
 		wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
 		wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
 		macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
-		iapp_interface eapol_version dynamic_vlan ieee80211w \
+		iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
 		acct_server acct_secret acct_port acct_interval
 
 	set_default isolate 0
@@ -253,6 +253,7 @@ hostapd_set_bss_options() {
 		[ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
 	}
 
+	[ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
 	[ -n "$acct_server" ] && {
 		append bss_conf "acct_server_addr=$acct_server" "$N"
 		append bss_conf "acct_server_port=$acct_port" "$N"
@@ -380,9 +381,8 @@ hostapd_set_bss_options() {
 	}
 
 	if [ "$wpa" -ge "1" ]; then
-		json_get_vars nasid ieee80211r
+		json_get_vars ieee80211r
 		set_default ieee80211r 0
-		[ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
 
 		if [ "$ieee80211r" -gt "0" ]; then
 			json_get_vars mobility_domain r0_key_lifetime r1_key_holder \