cfg80211: make handle_band() and handle_channel() wiphy specific

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

diff --git a/net/wireless/core.h b/net/wireless/core.h
index eb0f846..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;
 
@@ -78,4 +91,7 @@ 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 */