cfg80211/mac80211: Add 802.11d support

[safe/jmp/linux-2.6] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 158db1e..f7fb9f4 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -11,6 +11,7 @@
 #include <net/genetlink.h>
 #include <net/wireless.h>
 #include <net/cfg80211.h>
+#include "reg.h"
 
 struct cfg80211_registered_device {
        struct cfg80211_ops *ops;
@@ -21,6 +22,18 @@ struct cfg80211_registered_device {
         * any call is in progress */
        struct mutex mtx;
 
+       /* ISO / IEC 3166 alpha2 for which this device is receiving
+        * country IEs on, this can help disregard country IEs from APs
+        * on the same alpha2 quickly. The alpha2 may differ from
+        * cfg80211_regdomain's alpha2 when an intersection has occurred.
+        * If the AP is reconfigured this can also be used to tell us if
+        * the country on the country IE changed. */
+       char country_ie_alpha2[2];
+
+       /* If a Country IE has been received this tells us the environment
+        * which its telling us its in. This defaults to ENVIRON_ANY */
+       enum environment_cap env;
+
        /* wiphy index, internal only */
        int idx;
 
@@ -43,7 +56,42 @@ struct cfg80211_registered_device *wiphy_to_dev(struct wiphy *wiphy)
 extern struct mutex cfg80211_drv_mutex;
 extern struct list_head cfg80211_drv_list;
 
+/*
+ * This function returns a pointer to the driver
+ * that the genl_info item that is passed refers to.
+ * If successful, it returns non-NULL and also locks
+ * the driver's mutex!
+ *
+ * This means that you need to call cfg80211_put_dev()
+ * before being allowed to acquire &cfg80211_drv_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
+ * for all the time in order to allow requests on
+ * other interfaces to go through at the same time.
+ *
+ * The result of this can be a PTR_ERR and hence must
+ * be checked with IS_ERR() for errors.
+ */
+extern struct cfg80211_registered_device *
+cfg80211_get_dev_from_info(struct genl_info *info);
+
+/* identical to cfg80211_get_dev_from_info but only operate on ifindex */
+extern struct cfg80211_registered_device *
+cfg80211_get_dev_from_ifindex(int ifindex);
+
+extern void cfg80211_put_dev(struct cfg80211_registered_device *drv);
+
 /* free object */
 extern void cfg80211_dev_free(struct cfg80211_registered_device *drv);
 
+extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv,
+                              char *newname);
+
+void ieee80211_set_bitrate_flags(struct wiphy *wiphy);
+void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby);
+
 #endif /* __NET_WIRELESS_CORE_H */