summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2011-01-20 13:38:09 +0100
committerThomas Bächler <thomas@archlinux.org>2011-01-20 13:41:16 +0100
commit14ce7ede9d5b494229ca902f8a7ba21f3e58de9c (patch)
treee11b9d93d655609500a8d163e5bbc3931f4b62c7 /src
parent908428678697664643937801c77e1c2403419c9d (diff)
downloadnetctl-14ce7ede9d5b494229ca902f8a7ba21f3e58de9c.tar.gz
netctl-14ce7ede9d5b494229ca902f8a7ba21f3e58de9c.tar.xz
Change default wpa driver to nl80211,wext - requires wpa_supplicant 0.7
Diffstat (limited to 'src')
-rw-r--r--src/connections/wireless2
-rw-r--r--src/wireless2
2 files changed, 2 insertions, 2 deletions
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 |