From dce7afd6a8d4bcd6adb7f1d1b330c21fcb8c9957 Mon Sep 17 00:00:00 2001
From: James Rayner <james@archlinux.org>
Date: Sun, 27 Sep 2009 22:04:28 +1000
Subject: Only flush when disabling wireless interface, tidy up down/forcedown

---
 src/connections/wireless | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/connections/wireless')

diff --git a/src/connections/wireless b/src/connections/wireless
index 2d2463d..6de7379 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -43,7 +43,7 @@ iwconfig_up() {
         fi
     fi
 
-    quirk "predown" && bring_interface forcedown "$INTERFACE" # madwifi FS#10585
+    quirk "predown" && bring_interface down "$INTERFACE" # madwifi FS#10585
 
     report_debug wireless_up iwconfig "$INTERFACE" $WEP_OPTS
 
@@ -165,12 +165,10 @@ wireless_up() {
 
 # wireless_down PROFILE [ LEAVE ifconfig up? default no ]
 wireless_down() {
-    local PROFILE="$1" NOETHERNETDOWN="$2"
+    local PROFILE="$1"
     load_profile "$PROFILE"
 
-    if ! checkyesno "$NOETHERNETDOWN"; then
-        "$CONN_DIR/ethernet" down "$PROFILE"
-    fi
+    "$CONN_DIR/ethernet" down "$PROFILE"
 
     if [[ ${SECURITY:(-4)} == "-old" ]]; then
         report_debug wireless_down iwconfig "$INTERFACE" essid off key off
-- 
cgit v1.2.3-24-g4f1b