Commit c8866e55 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

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: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 52616f2b
...@@ -667,6 +667,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable); ...@@ -667,6 +667,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable);
* IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface * 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 * associated to an AP on the same channel or on the same UNII band
* (assuming that the AP is an authorized master). * (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, static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
struct ieee80211_channel *chan) struct ieee80211_channel *chan)
...@@ -677,8 +679,14 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, ...@@ -677,8 +679,14 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
ASSERT_RTNL(); ASSERT_RTNL();
if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) || if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) ||
!(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR) || !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR))
!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) return false;
if (regulatory_indoor_allowed() &&
(chan->flags & IEEE80211_CHAN_INDOOR_ONLY))
return true;
if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT))
return false; return false;
/* /*
......
...@@ -2701,6 +2701,11 @@ int cfg80211_get_unii(int freq) ...@@ -2701,6 +2701,11 @@ int cfg80211_get_unii(int freq)
return -EINVAL; return -EINVAL;
} }
bool regulatory_indoor_allowed(void)
{
return reg_is_indoor;
}
int __init regulatory_init(void) int __init regulatory_init(void)
{ {
int err = 0; int err = 0;
......
...@@ -117,4 +117,9 @@ void regulatory_hint_disconnect(void); ...@@ -117,4 +117,9 @@ void regulatory_hint_disconnect(void);
*/ */
int cfg80211_get_unii(int freq); int cfg80211_get_unii(int freq);
/**
* regulatory_indoor_allowed - is indoor operation allowed
*/
bool regulatory_indoor_allowed(void);
#endif /* __NET_WIRELESS_REG_H */ #endif /* __NET_WIRELESS_REG_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment