git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
8911927
..
1ef6282
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;