diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-08-26 10:33:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-26 10:33:51 -0400 |
commit | e2e6be56df37c371f564e127c154036b0c2211a1 (patch) | |
tree | 6687fc0340c20a76972bcaf5c665364c1074aee8 /include | |
parent | bc909d9ddbf7778371e36a651d6e4194b1cc7d4c (diff) | |
parent | 8b2a3827bb12430d932cd479b22d906baf08c212 (diff) | |
download | linux-3.10-e2e6be56df37c371f564e127c154036b0c2211a1.tar.gz linux-3.10-e2e6be56df37c371f564e127c154036b0c2211a1.tar.bz2 linux-3.10-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.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index d17f47fc9e3..408ae4882d2 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; |