scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-01 10:57:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

hostapd: fix dynamic_vlan

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-11-22 18:37:43 +01:00
parent c8c5f14071
commit 75374d2765
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
feeds/ipq807x_v5.4/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -823,6 +823,8 @@ mac80211_prepare_vif() {
json_select config json_select config
json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
local config_wpa_psk_file="$wpa_psk_file"
local config_vlan_file="$vlan_file"
[ -n "$ifname" ] || { [ -n "$ifname" ] || {
local prefix; local prefix;
@@ -904,8 +906,8 @@ mac80211_prepare_vif() {
json_select .. json_select ..
[ "$mode" == "ap" ] && { [ "$mode" == "ap" ] && {
[ -z "$wpa_psk_file" ] && hostapd_set_psk "$ifname" [ -z "$config_wpa_psk_file" ] && hostapd_set_psk "$ifname"
[ -z "$vlan_file" ] && hostapd_set_vlan "$ifname" [ -z "$config_vlan_file" ] && hostapd_set_vlan "$ifname"
} }
} }

6
feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -823,6 +823,8 @@ mac80211_prepare_vif() {
json_select config json_select config
json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
local config_wpa_psk_file="$wpa_psk_file"
local config_vlan_file="$vlan_file"
[ -n "$ifname" ] || { [ -n "$ifname" ] || {
local prefix; local prefix;
@@ -904,8 +906,8 @@ mac80211_prepare_vif() {
json_select .. json_select ..
[ "$mode" == "ap" ] && { [ "$mode" == "ap" ] && {
[ -z "$wpa_psk_file" ] && hostapd_set_psk "$ifname" [ -z "$config_wpa_psk_file" ] && hostapd_set_psk "$ifname"
[ -z "$vlan_file" ] && hostapd_set_vlan "$ifname" [ -z "$config_vlan_file" ] && hostapd_set_vlan "$ifname"
} }
} }