cfg80211: Enable GO operation on indoor channels

Allow GO operation on a channel marked with IEEE80211_CHAN_INDOOR_ONLY
iff there is a user hint indicating that the platform is operating in
an indoor environment, i.e., the platform is a printer or media center
device.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 50202af7fba3499dcbbf8dbbdc6abcc950128aeb..c3180dc03a334f9c9cc2a541e7bc702b2b0a2123 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -667,6 +667,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable);
  * IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface
  * associated to an AP on the same channel or on the same UNII band
  * (assuming that the AP is an authorized master).
+ * In addition allow the GO to operate on a channel on which indoor operation is
+ * allowed, iff we are currently operating in an indoor environment.
  */
 static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
                                        struct ieee80211_channel *chan)
@@ -677,8 +679,14 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
        ASSERT_RTNL();
 
        if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) ||
-           !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR) ||
-           !(chan->flags & IEEE80211_CHAN_GO_CONCURRENT))
+           !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR))
+               return false;
+
+       if (regulatory_indoor_allowed() &&
+           (chan->flags & IEEE80211_CHAN_INDOOR_ONLY))
+               return true;
+
+       if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT))
                return false;
 
        /*

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 55d68c31ad729845b739e9d5152443f61396f9c8..bf3b0938891db90ef35c2b8a7ea68dd6ea2c1341 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2701,6 +2701,11 @@ int cfg80211_get_unii(int freq)
        return -EINVAL;
 }
 
+bool regulatory_indoor_allowed(void)
+{
+       return reg_is_indoor;
+}
+
 int __init regulatory_init(void)
 {
        int err = 0;

diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index 2a3842828f6d9333c93eb3f813aa2cc04e904e45..5e48031ccb9afc33a41c36221e3bef924625ebe8 100644 (file)
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -117,4 +117,9 @@ void regulatory_hint_disconnect(void);
  */
 int cfg80211_get_unii(int freq);
 
+/**
+ * regulatory_indoor_allowed - is indoor operation allowed
+ */
+bool regulatory_indoor_allowed(void);
+
 #endif  /* __NET_WIRELESS_REG_H */