[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 2bea5c68313577b214b872b0edc5968db0cf3b68
Author: Mike Westerhof <mwester at dls.net>
Date:   Tue Apr 14 02:10:02 2009 -0500

    Fix kernel oops when starting wpa_supplicant.
    This closes bug #2267.
    
    Signed-off-by: Mike Westerhof <mwester at dls.net>

diff --git a/drivers/ar6000/ar6000/wireless_ext.c b/drivers/ar6000/ar6000/wireless_ext.c
index d9a5920..af78ae0 100644
--- a/drivers/ar6000/ar6000/wireless_ext.c
+++ b/drivers/ar6000/ar6000/wireless_ext.c
@@ -976,6 +976,16 @@ static int ar6000_ioctl_giwpower(struct net_device *dev,
 {
 	AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
 
+	/*
+	 * FIXME:
+	 * https://docs.openmoko.org/trac/ticket/2267
+	 * When starting wpa_supplicant the kernel oopses.
+	 * The following condition avoids the oops.
+	 * Remove this comment to bless this solution.
+	 */
+	if (ar->arWlanState == WLAN_DISABLED || ar->arWmiReady == FALSE)
+		return -EIO;
+
 	return wmi_get_power_mode_cmd(ar->arWmi);
 }
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko