We shall enforce the cipher for both, pairwise and group, thus change
the name of the variable to a more generic phrasing, 'cipher' instead
of 'pairwise'.
Signed-off-by: Daniel Golle <dan...@makrotopia.org>
---
scripts/netifd-wireless.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index d5f3867..a0f91ed 100644
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -195,15 +195,15 @@ wireless_vif_parse_encryption() {
auth_mode_open=1
auth_mode_shared=0
auth_type=none
- wpa_pairwise=CCMP
+ wpa_cipher=CCMP
case "$encryption" in
- *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_pairwise="CCMP
TKIP";;
- *aes|*ccmp) wpa_pairwise="CCMP";;
- *tkip) wpa_pairwise="TKIP";;
+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_cipher="CCMP
TKIP";;
+ *aes|*ccmp) wpa_cipher="CCMP";;
+ *tkip) wpa_cipher="TKIP";;
esac
# 802.11n requires CCMP for WPA
- [ "$enable_ht:$wpa_pairwise" = "1:TKIP" ] && wpa_pairwise="CCMP TKIP"
+ [ "$enable_ht:$wpa_cipher" = "1:TKIP" ] && wpa_cipher="CCMP TKIP"
# Examples:
# psk-mixed/tkip => WPA1+2 PSK, TKIP
@@ -222,7 +222,7 @@ wireless_vif_parse_encryption() {
;;
*)
wpa=0
- wpa_pairwise=
+ wpa_cipher=
;;
esac
--
2.7.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
