Merge branch 'linux-2.6' into merge

[linux-2.6] / include / net / ieee80211softmac.h

diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 89119277553dbb8dbe90085088d4242c27f3c023..1ef6282fdded66520c5a15956848a77dfaaecbfa 100644 (file)
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -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;