Merge tag 'hwlock-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index ee8388fe4a92cb8849f5a83ca0be13b9766f176c..ed487e324571421cdc9a61f5dbe6b2e723531f4a 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -28,7 +28,7 @@ struct cfg80211_registered_device {
        /* rfkill support */
        struct rfkill_ops rfkill_ops;
        struct rfkill *rfkill;
-       struct work_struct rfkill_sync;
+       struct work_struct rfkill_block;
 
        /* ISO / IEC 3166 alpha2 for which this device is receiving
         * country IEs on, this can help disregard country IEs from APs
@@ -306,6 +306,8 @@ void ieee80211_set_bitrate_flags(struct wiphy *wiphy);
 void cfg80211_bss_expire(struct cfg80211_registered_device *rdev);
 void cfg80211_bss_age(struct cfg80211_registered_device *rdev,
                       unsigned long age_secs);
+void cfg80211_update_assoc_bss_entry(struct wireless_dev *wdev,
+                                    struct ieee80211_channel *channel);
 
 /* IBSS */
 int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,