Message ID | 1390818118-27261-6-git-send-email-ilan.peer@intel.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Mon, Jan 27, 2014 at 12:21:57PM +0200, Ilan Peer wrote: > 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> > --- > net/wireless/chan.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/net/wireless/chan.c b/net/wireless/chan.c > index 87a9d0e..4ae3cd0 100644 > --- a/net/wireless/chan.c > +++ b/net/wireless/chan.c > @@ -611,14 +611,20 @@ 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) > { > struct wireless_dev *wdev_iter; > + struct wiphy *wiphy = wiphy_idx_to_wiphy(rdev->wiphy_idx); > > ASSERT_RTNL(); > > + if (regulatory_ir_allowed(wiphy, chan)) > + return true; > + > if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) > return false; Looks good. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 87a9d0e..4ae3cd0 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -611,14 +611,20 @@ 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) { struct wireless_dev *wdev_iter; + struct wiphy *wiphy = wiphy_idx_to_wiphy(rdev->wiphy_idx); ASSERT_RTNL(); + if (regulatory_ir_allowed(wiphy, chan)) + return true; + if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) return false;
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> --- net/wireless/chan.c | 6 ++++++ 1 file changed, 6 insertions(+)