r3993 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-31 10:23:37 +0100 (Thu, 31 Jan 2008)
New Revision: 3993

Modified:
   branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
Log:
Subject: [PATCH 3/3] ar6k: Scan request synchronization

We now wait for the scan done event before returning from the wireless
extension scan call.
This way we make sure that userspace doesn't ask for scan results before
we actually have them.

Signed-off-by: Samuel Ortiz <sameo at openedhand.com>

---
 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c   |    7 ++++++-
 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h   |    1 +
 drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c |    4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)



Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch	2008-01-31 09:22:11 UTC (rev 3992)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch	2008-01-31 09:23:37 UTC (rev 3993)
@@ -79,7 +79,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -0,0 +1,3070 @@
+@@ -0,0 +1,3075 @@
 +/*
 + *
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -281,6 +281,8 @@
 +
 +int reconnect_flag = 0;
 +
++DECLARE_WAIT_QUEUE_HEAD(ar6000_scan_queue);
++
 +/* Function declarations */
 +static int ar6000_init_module(void);
 +static void ar6000_cleanup_module(void);
@@ -2502,7 +2504,10 @@
 +void
 +ar6000_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status)
 +{
-+    AR_DEBUG_PRINTF("AR6000 scan complete: %d\n", status);
++	AR_DEBUG_PRINTF("AR6000 scan complete: %d\n", status);
++
++	ar->scan_complete = 1;
++	wake_up_interruptible(&ar6000_scan_queue);
 +}
 +
 +void
@@ -3154,7 +3159,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-@@ -0,0 +1,361 @@
+@@ -0,0 +1,362 @@
 +/*
 + *
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -3441,6 +3446,7 @@
 +    A_UINT32                log_cnt;
 +    A_UINT32                dbglog_init_done;
 +    A_UINT32                arConnectCtrlFlags;
++	A_UINT32                scan_complete;
 +#ifdef USER_KEYS
 +    A_INT32                 user_savedkeys_stat;
 +    A_UINT32                user_key_ctrl;
@@ -8419,7 +8425,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -0,0 +1,2068 @@
+@@ -0,0 +1,2072 @@
 +/*
 + *
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -8445,6 +8451,7 @@
 +static void ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi);
 +extern unsigned int wmitimeout;
 +extern A_WAITQUEUE_HEAD arEvent;
++extern wait_queue_head_t ar6000_scan_queue;
 +
 +#ifdef  __ATH_CENTRAL_IOCTL_DISPATCHER___
 +extern int allow_trace_signal;
@@ -10153,6 +10160,9 @@
 +        ret = -EIO;
 +    }
 +
++    ar->scan_complete = 0;
++    wait_event_interruptible_timeout(ar6000_scan_queue, ar->scan_complete,
++				     5 * HZ);
 +
 +    return ret;
 +#undef  ACT_DWELLTIME_DEFAULT