summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-08-26 16:33:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-08-26 16:33:51 +0200
commite2e6be56df37c371f564e127c154036b0c2211a1 (patch)
tree6687fc0340c20a76972bcaf5c665364c1074aee8 /include
parentsendmmsg/sendmsg: fix unsafe user pointer access (diff)
parentath9k: Fix PS wrappers in ath9k_set_coverage_class (diff)
downloadlinux-e2e6be56df37c371f564e127c154036b0c2211a1.tar.xz
linux-e2e6be56df37c371f564e127c154036b0c2211a1.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d17f47fc9e31..408ae4882d22 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1865,6 +1865,9 @@ struct wiphy {
* you need use set_wiphy_dev() (see below) */
struct device dev;
+ /* protects ->resume, ->suspend sysfs callbacks against unregister hw */
+ bool registered;
+
/* dir in debugfs: ieee80211/<wiphyname> */
struct dentry *debugfsdir;