wlanclient: Do not force using legacy interface to talk to the kernel

[ipfire-2.x.git] / src / initscripts / system / wlanclient

diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient
index 27a144f723c6dcb9edf63c8e90586fdaab76d7e0..338a743ab72e4ad69efcb4780116d8d71e1807cc 100644 (file)
--- a/src/initscripts/system/wlanclient
+++ b/src/initscripts/system/wlanclient
@@ -143,7 +143,7 @@ function wpa_supplicant_config_line() {
 
        case "${mode}" in
                EAP)
-                       key_mgmt="WPA-EAP"
+                       key_mgmt="WPA-EAP-SHA256 WPA-EAP"
                        ;;
                WPA3)
                        key_mgmt="SAE"
@@ -153,12 +153,12 @@ function wpa_supplicant_config_line() {
                WPA2)
                        auth_alg="OPEN"
                        proto="RSN"
-                       key_mgmt="WPA-PSK"
+                       key_mgmt="WPA-PSK-SHA256 WPA-PSK"
                        ;;
                WPA)
                        auth_alg="OPEN"
                        proto="WPA"
-                       key_mgmt="WPA-PSK"
+                       key_mgmt="WPA-PSK-SHA256 WPA-PSK"
                        ;;
                WEP)
                        auth_alg="SHARED"
@@ -275,9 +275,7 @@ function wpa_supplicant_start() {
        # Build wpa_supplicant command line.
        local wpa_suppl_cmd="wpa_supplicant -B -qqq -i${device} -c${config}"
 
-       if device_is_wireless ${device}; then
-               wpa_suppl_cmd="${wpa_suppl_cmd} -Dwext"
-       else
+       if ! device_is_wireless ${device}; then
                wpa_suppl_cmd="${wpa_suppl_cmd} -Dwired"
        fi