Skip to content

Commit c8866e5

Browse files
ilanpeer2jmberg-intel
authored andcommitted
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>
1 parent 52616f2 commit c8866e5

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

net/wireless/chan.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable);
667667
* IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface
668668
* associated to an AP on the same channel or on the same UNII band
669669
* (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.
670672
*/
671673
static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
672674
struct ieee80211_channel *chan)
@@ -677,8 +679,14 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
677679
ASSERT_RTNL();
678680

679681
if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) ||
680-
!(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR) ||
681-
!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT))
682+
!(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR))
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))
682690
return false;
683691

684692
/*

net/wireless/reg.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,6 +2701,11 @@ int cfg80211_get_unii(int freq)
27012701
return -EINVAL;
27022702
}
27032703

2704+
bool regulatory_indoor_allowed(void)
2705+
{
2706+
return reg_is_indoor;
2707+
}
2708+
27042709
int __init regulatory_init(void)
27052710
{
27062711
int err = 0;

net/wireless/reg.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,9 @@ void regulatory_hint_disconnect(void);
117117
*/
118118
int cfg80211_get_unii(int freq);
119119

120+
/**
121+
* regulatory_indoor_allowed - is indoor operation allowed
122+
*/
123+
bool regulatory_indoor_allowed(void);
124+
120125
#endif /* __NET_WIRELESS_REG_H */

0 commit comments

Comments
 (0)