diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2016-01-19 00:24:38 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-19 10:01:56 +0100 |
| commit | 627e8b6991876b4abef6bb4a31dcdc35fcd622aa (patch) | |
| tree | 80cd4dfad69f4f885662c03220d134db0b0324e8 /scripts | |
| parent | 8ce9331fcc9cc63e71d1d57321f335359797b981 (diff) | |
| download | netifd-627e8b6991876b4abef6bb4a31dcdc35fcd622aa.tar.gz | |
wireless: rename 'wpa_pairwise' variable to 'wpa_cipher'
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 <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org> [keep a copy for compatibility reasons]
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/netifd-wireless.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh index d5f3867..87d13ca 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,9 +222,10 @@ wireless_vif_parse_encryption() { ;; *) wpa=0 - wpa_pairwise= + wpa_cipher= ;; esac + wpa_pairwise="$wpa_cipher" case "$encryption" in *psk*) |