cfg80211: add assert_cfg80211_lock() to ensure proper protection

[mirror_ubuntu-bionic-kernel.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index f7fb9f413028a7f4783e2d7ae1616ebc1dcfe311..982cc6be34846213bae00c5d2d6a95aacf4fbab3 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -8,6 +8,9 @@
 #include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#include <linux/kref.h>
+#include <linux/rbtree.h>
+#include <linux/mutex.h>
 #include <net/genetlink.h>
 #include <net/wireless.h>
 #include <net/cfg80211.h>
@@ -35,12 +38,20 @@ struct cfg80211_registered_device {
        enum environment_cap env;
 
        /* wiphy index, internal only */
-       int idx;
+       int wiphy_idx;
 
        /* associate netdev list */
        struct mutex devlist_mtx;
        struct list_head netdev_list;
 
+       /* BSSes/scanning */
+       spinlock_t bss_lock;
+       struct list_head bss_list;
+       struct rb_root bss_tree;
+       u32 bss_generation;
+       struct cfg80211_scan_request *scan_req; /* protected by RTNL */
+       unsigned long suspend_at;
+
        /* must be last because of the way we do wiphy_priv(),
         * and it should at least be aligned to NETDEV_ALIGN */
        struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
@@ -53,9 +64,30 @@ struct cfg80211_registered_device *wiphy_to_dev(struct wiphy *wiphy)
        return container_of(wiphy, struct cfg80211_registered_device, wiphy);
 }
 
-extern struct mutex cfg80211_drv_mutex;
+/* Note 0 is valid, hence phy0 */
+static inline
+bool wiphy_idx_valid(int wiphy_idx)
+{
+       return (wiphy_idx >= 0);
+}
+
+extern struct mutex cfg80211_mutex;
 extern struct list_head cfg80211_drv_list;
 
+static inline void assert_cfg80211_lock(void)
+{
+       BUG_ON(!mutex_is_locked(&cfg80211_mutex));
+}
+
+struct cfg80211_internal_bss {
+       struct list_head list;
+       struct rb_node rbn;
+       unsigned long ts;
+       struct kref ref;
+       /* must be last because of priv member */
+       struct cfg80211_bss pub;
+};
+
 /*
  * This function returns a pointer to the driver
  * that the genl_info item that is passed refers to.
@@ -63,13 +95,13 @@ extern struct list_head cfg80211_drv_list;
  * the driver's mutex!
  *
  * This means that you need to call cfg80211_put_dev()
- * before being allowed to acquire &cfg80211_drv_mutex!
+ * before being allowed to acquire &cfg80211_mutex!
  *
  * This is necessary because we need to lock the global
  * mutex to get an item off the list safely, and then
  * we lock the drv mutex so it doesn't go away under us.
  *
- * We don't want to keep cfg80211_drv_mutex locked
+ * We don't want to keep cfg80211_mutex locked
  * for all the time in order to allow requests on
  * other interfaces to go through at the same time.
  *
@@ -94,4 +126,8 @@ extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv,
 void ieee80211_set_bitrate_flags(struct wiphy *wiphy);
 void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby);
 
+void cfg80211_bss_expire(struct cfg80211_registered_device *dev);
+void cfg80211_bss_age(struct cfg80211_registered_device *dev,
+                      unsigned long age_secs);
+
 #endif /* __NET_WIRELESS_CORE_H */