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/net | |
| parent | bc909d9ddbf7778371e36a651d6e4194b1cc7d4c (diff) | |
| parent | 8b2a3827bb12430d932cd479b22d906baf08c212 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include/net')
| -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 d17f47fc9e31..408ae4882d22 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -1865,6 +1865,9 @@ struct wiphy { | |||
| 1865 | * you need use set_wiphy_dev() (see below) */ | 1865 | * you need use set_wiphy_dev() (see below) */ |
| 1866 | struct device dev; | 1866 | struct device dev; |
| 1867 | 1867 | ||
| 1868 | /* protects ->resume, ->suspend sysfs callbacks against unregister hw */ | ||
| 1869 | bool registered; | ||
| 1870 | |||
| 1868 | /* dir in debugfs: ieee80211/<wiphyname> */ | 1871 | /* dir in debugfs: ieee80211/<wiphyname> */ |
| 1869 | struct dentry *debugfsdir; | 1872 | struct dentry *debugfsdir; |
| 1870 | 1873 | ||