diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-09-13 19:41:16 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 19:41:16 (GMT) |
commit | b4d3de8ca25fcdf697da38d9f9785cb508edea4d (patch) | |
tree | 8d2940fab556b05f4f1c7980c611211ffaa0f025 /include | |
parent | 3857e3ee2209b7289c434103e366f765ec82a22d (diff) | |
parent | 2fa8b6a0e42570690a48a56cb65778211e3cc9cc (diff) | |
download | linux-fsl-qoriq-b4d3de8ca25fcdf697da38d9f9785cb508edea4d.tar.xz |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cfg80211.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 88112ca..eb2659a 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1792,6 +1792,7 @@ struct wiphy_wowlan_support { * @debugfsdir: debugfs directory used for this wiphy, will be renamed * automatically on wiphy renames * @dev: (virtual) struct device for this wiphy + * @registered: helps synchronize suspend/resume with wiphy unregister * @wext: wireless extension handlers * @priv: driver private data (sized according to wiphy_new() parameter) * @interface_modes: bitmask of interfaces types valid for this wiphy, |