summaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/files/hostapd.sh
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2024-01-13 11:19:07 +0100
committerFelix Fietkau <nbd@nbd.name>2024-01-13 11:19:34 +0100
commit5b8f188c0f0a18eecc7a5f4078b96338c3c282f2 (patch)
tree3846fe8d76e8e181e24673355f27102516c49200 /package/network/services/hostapd/files/hostapd.sh
parentb7f9742da82fa9b122e8d63e48a9a5c0dec298f2 (diff)
downloadopenwrt-5b8f188c0f0a18eecc7a5f4078b96338c3c282f2.tar.gz
openwrt-5b8f188c0f0a18eecc7a5f4078b96338c3c282f2.tar.bz2
openwrt-5b8f188c0f0a18eecc7a5f4078b96338c3c282f2.zip
Revert "mac80211: rework interface setup, fix race condition"
This reverts commit b7f9742da82fa9b122e8d63e48a9a5c0dec298f2. There are several reports of regressions with this commit. Will be added back once I've figured out and fixed the cause Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/hostapd/files/hostapd.sh')
-rw-r--r--package/network/services/hostapd/files/hostapd.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index c0c39a9399..271c1f7bec 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -398,7 +398,6 @@ hostapd_set_vlan() {
rm -f /var/run/hostapd-${ifname}.vlan
for_each_vlan hostapd_set_vlan_file ${ifname}
- touch /var/run/hostapd-${ifname}.vlan
}
hostapd_set_psk_file() {
@@ -417,7 +416,6 @@ hostapd_set_psk() {
rm -f /var/run/hostapd-${ifname}.psk
for_each_station hostapd_set_psk_file ${ifname}
- touch /var/run/hostapd-${ifname}.psk
}
append_iw_roaming_consortium() {
@@ -690,7 +688,10 @@ hostapd_set_bss_options() {
return 1
fi
[ -z "$wpa_psk_file" ] && set_default wpa_psk_file /var/run/hostapd-$ifname.psk
- [ -n "$wpa_psk_file" ] && append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+ [ -n "$wpa_psk_file" ] && {
+ [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
+ append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+ }
[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
set_default dynamic_vlan 0