diff options
author | Ilan Peer <ilan.peer@intel.com> | 2014-02-23 02:13:03 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-09 04:55:37 -0400 |
commit | c8866e55a94fb02b83b13f289e5e470fc928703a (patch) | |
tree | ac49e6b637f9b24dab338b3067f1aaf6fc2ce0e1 /net/wireless/chan.c | |
parent | 52616f2b446eaad8eb2cd78bbd052f0066069757 (diff) |
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>
Diffstat (limited to 'net/wireless/chan.c')
-rw-r--r-- | net/wireless/chan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 50202af7fba3..c3180dc03a33 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c | |||
@@ -667,6 +667,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable); | |||
667 | * IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface | 667 | * IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface |
668 | * associated to an AP on the same channel or on the same UNII band | 668 | * associated to an AP on the same channel or on the same UNII band |
669 | * (assuming that the AP is an authorized master). | 669 | * (assuming that the AP is an authorized master). |
670 | * In addition allow the GO to operate on a channel on which indoor operation is | ||
671 | * allowed, iff we are currently operating in an indoor environment. | ||
670 | */ | 672 | */ |
671 | static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, | 673 | static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, |
672 | struct ieee80211_channel *chan) | 674 | struct ieee80211_channel *chan) |
@@ -677,8 +679,14 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, | |||
677 | ASSERT_RTNL(); | 679 | ASSERT_RTNL(); |
678 | 680 | ||
679 | if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) || | 681 | if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) || |
680 | !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR) || | 682 | !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR)) |
681 | !(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) | 683 | return false; |
684 | |||
685 | if (regulatory_indoor_allowed() && | ||
686 | (chan->flags & IEEE80211_CHAN_INDOOR_ONLY)) | ||
687 | return true; | ||
688 | |||
689 | if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) | ||
682 | return false; | 690 | return false; |
683 | 691 | ||
684 | /* | 692 | /* |