Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[pandora-kernel.git] / include / net / ieee80211softmac.h

diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 617b672..1ef6282 100644 (file)
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -108,8 +108,8 @@ struct ieee80211softmac_assoc_info {
        /* Scan retries remaining */
        int scan_retry;
 
-       struct work_struct work;
-       struct work_struct timeout;
+       struct delayed_work work;
+       struct delayed_work timeout;
 };
 
 struct ieee80211softmac_bss_info {
@@ -229,6 +229,8 @@ struct ieee80211softmac_device {
        /* this lock protects this structure */
        spinlock_t lock;
 
+       struct workqueue_struct *wq;
+
        u8 running; /* SoftMAC started? */
        u8 scanning;