diff --git a/[refs] b/[refs] index 36a36dbbbaba..9e7ebd201be4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79016f648872549392d232cd648bd02298c2d2bb +refs/heads/master: d2f152878d457a84f3708acee5f682322386a79b diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index 408ae4882d22..401d73bd151f 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -1744,6 +1744,8 @@ struct wiphy_wowlan_support { * by default for perm_addr. In this case, the mask should be set to * all-zeroes. In this case it is assumed that the device can handle * the same number of arbitrary MAC addresses. + * @registered: protects ->resume and ->suspend sysfs callbacks against + * unregister hardware * @debugfsdir: debugfs directory used for this wiphy, will be renamed * automatically on wiphy renames * @dev: (virtual) struct device for this wiphy