[Debian-eeepc-devel] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 6742528e5492fed9adff8cb50935b08123ee9405

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit dc50eb33e2757c7f5fa8b18de0b74d011b772a54
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sun Sep 7 12:15:14 2008 +0300

    wireless: load/unload the wireless kernel module only for madwifi
    
    ralink does not need this, hot-plugging works for it allright
    
    ath5k not tested

diff --git a/actions/wireless.sh b/actions/wireless.sh
index 6a309f6..6e421f7 100755
--- a/actions/wireless.sh
+++ b/actions/wireless.sh
@@ -10,18 +10,23 @@ case $1 in
 	if [ $(cat $wlan_control) = 0 ]; then
 	    echo 1 > $wlan_control
             detect_wlan
-	    modprobe $WLAN_MOD
-	    # adding a sleep here, due to some bug the driver loading is not atomic here
-	    # and could cause ifconfig to fail
-	    sleep 1
-	    if ! ifconfig $WLAN_IF up; then exec $0 off; fi
+	    if [ "$WLAN_MOD" = 'ath_pci' ]; then
+		# madwifi needs some handholding
+		modprobe $WLAN_MOD
+		# adding a sleep here, due to some bug the driver loading is not atomic here
+		# and could cause ifconfig to fail
+		sleep 1
+		if ! ifconfig $WLAN_IF up; then exec $0 off; fi
+	    fi
 	fi
 	;;
     off|disable)
 	if [ $(cat $wlan_control) = 1 ]; then
             detect_wlan
-	    ifdown --force $WLAN_IF
-	    modprobe -r $WLAN_MOD
+	    if [ "$WLAN_MOD" = 'ath_pci' ]; then
+		ifdown --force $WLAN_IF
+		modprobe -r $WLAN_MOD
+	    fi
 	    echo 0 > $wlan_control
 	fi
 	;;

-- 
Maintenance of eeepc-acpi-scripts debian package