From b0373830cd79e35ea0d266726109c36a57122857 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 3 Jul 2012 12:01:41 +0200
Subject: Revert "Don't rely on wpa_cli reconfigure to reload wpa.conf"

This reverts commit 0d4c3ce797e688e146768bac07f6162d02634140.

The reverted commit created a situation where wpa_supplicant is unnecessarily started and stopped in many cases, causing noticeable delay.
If wpa_supplicant still fails to associate properly, wpa_reconfigure() should be modified in src/8021x.
---
 src/connections/wireless | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/connections/wireless b/src/connections/wireless
index 44a25b4..efcda80 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -54,9 +54,6 @@ wireless_up() {
         fi
     fi
 
-    report_debug wireless_up stop_wpa "$INTERFACE"
-    stop_wpa "$INTERFACE"
-
     # Build configuration file
     case "$SECURITY" in
         wpa-config)
@@ -64,6 +61,12 @@ wireless_up() {
         none|wep|wpa|wpa-configsection)
             printf "%s\n" "network={" "$(make_wpa_config)" "}" >> "$WPA_CONF"
             report_debug wireless_up "Configuration generated at $WPA_CONF"
+            report_debug wireless_up wpa_reconfigure "$INTERFACE"
+            if ! wpa_reconfigure "$INTERFACE"; then
+                report_fail "WPA configuration failed!"
+                stop_wpa "$INTERFACE"
+                return 1
+            fi
             ;;
         *)
             report_fail "Invalid SECURITY setting: $SECURITY"
@@ -76,12 +79,6 @@ wireless_up() {
     report_debug wireless_up ifup
     bring_interface up "$INTERFACE" || return 1
 
-    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"
-        return 1
-    fi
-
     report_debug wireless_up wpa_check
     if ! wpa_check "$INTERFACE" "$TIMEOUT"; then
         report_fail "WPA Authentication/Association Failed"
-- 
cgit v1.2.3-24-g4f1b