cfg80211: make regulatory_request use wiphy_idx instead of wiphy

We do this so later on we can move the pending requests onto a
workqueue. By using the wiphy_idx instead of the wiphy we can
later easily check if the wiphy has disappeared or not.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 43ac90df4164..bb9129fc61ca 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -383,9 +383,9 @@ enum environment_cap {
 };
 
 /**
- * struct regulatory_request - receipt of last regulatory request
+ * struct regulatory_request - used to keep track of regulatory requests
  *
- * @wiphy: this is set if this request's initiator is
+ * @wiphy_idx: this is set if this request's initiator is
  *      %REGDOM_SET_BY_COUNTRY_IE or %REGDOM_SET_BY_DRIVER. This
  *      can be used by the wireless core to deal with conflicts
  *      and potentially inform users of which devices specifically
@@ -406,7 +406,7 @@ enum environment_cap {
  *      indoor, or if it doesn't matter
  */
 struct regulatory_request {
-        struct wiphy *wiphy;
+        int wiphy_idx;
         enum reg_set_by initiator;
         char alpha2[2];
         bool intersect;