summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/wireless2
-rw-r--r--src/connections/wireless2
-rw-r--r--src/wireless2
-rwxr-xr-xwpa_actiond/netcfg-wpa_actiond2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/wireless b/docs/wireless
index 785b552..6977bd7 100644
--- a/docs/wireless
+++ b/docs/wireless
@@ -34,7 +34,7 @@ WPA_GROUP
WPA_COUNTRY (optional, nl80211 based drivers)
: The country where the device will be used. This allows wpa_supplicant to enforce any local regulatory limitations and will allow all appropriate channels/frequencies for your device.
WPA_DRIVER (optional)
-: The wpa_supplicant driver interface to be used. Defaults to 'wext'. nl80211 based drivers are recommended to use 'nl80211'
+: A comma-separated list of wpa_supplicant driver interfaces to try. Defaults to 'nl80211,wext'.
### rfkill (Radio Kill Switch) options
RFKILL
diff --git a/src/connections/wireless b/src/connections/wireless
index a95496a..d93a672 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -109,7 +109,7 @@ wireless_up() {
if [[ ${SECURITY:(-4)} != "-old" ]]; then
report_debug wireless_up "Configuration generated at $WPA_CONF"
- [[ -z "$WPA_DRIVER" ]] && WPA_DRIVER="wext"
+ [[ -z "$WPA_DRIVER" ]] && WPA_DRIVER="nl80211,wext"
report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS"
if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS"; then
report_fail "wpa_supplicant did not start, possible configuration error"
diff --git a/src/wireless b/src/wireless
index d6b8b39..22b84a9 100644
--- a/src/wireless
+++ b/src/wireless
@@ -86,7 +86,7 @@ wpa_supplicant_scan_info() {
[[ -z "$INTERFACE" ]] && return 1
essids=$(mktemp --tmpdir essid.XXXXXXXX)
- wpa_supplicant -B -i"$INTERFACE" -Dwext -C/var/run/wpa_supplicant -P/var/run/wpa_supplicant.pid || return 1
+ wpa_supplicant -B -i"$INTERFACE" -Dnl80211,wext -C/var/run/wpa_supplicant -P/var/run/wpa_supplicant.pid || return 1
wpa_cli -i "$INTERFACE" scan &> /dev/null
sleep 2.5
wpa_cli -i "$INTERFACE" scan_results |
diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond
index a90d4cc..4abc5ab 100755
--- a/wpa_actiond/netcfg-wpa_actiond
+++ b/wpa_actiond/netcfg-wpa_actiond
@@ -66,7 +66,7 @@ for profile in $(list_profiles); do
done
-[[ -z $WPA_DRIVER ]] && WPA_DRIVER="wext"
+[[ -z $WPA_DRIVER ]] && WPA_DRIVER="nl80211,wext"
WPA_OPTS="-W $WPA_OPTS"
# Kill any existing wpa_supplicant on this interface