| Message ID | 1389801162-14488-4-git-send-email-ilan.peer@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Jan 15, 2014 at 05:52:39PM +0200, Ilan Peer wrote: > Allow GO operation on a channel marked with IEEE80211_CHAN_GO_CONCURRENT > iff there is an active station interface that is associated to > an AP operating on the same channel in 2.4 or the same UNII band in 5.2 > (assuming that the AP is an authorized master) > > Note that this is a permissive approach to the FCC definitions, > that require a clear assessment that the device operating the AP is > an authorized master, i.e., with radar detection and DFS capabilities. > > It is assumed that such restrictions are enforced by user space. > Furthermore, it is assumed, that if the conditions that allowed for > the operation of the GO on such a channel change, i.e., the station > interface disconnected from the AP, it is the responsibility of user > space to evacuate the GO from the channel. You may be interested in perhaps picking up my regulatory quiescing patch. Can you check and let me know? > diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig > index 81c05e4..f4012fc 100644 > --- a/net/wireless/Kconfig > +++ b/net/wireless/Kconfig > @@ -102,6 +102,15 @@ config CFG80211_REG_CELLULAR_HINTS > This option adds support for drivers that can receive regulatory > hints from cellular base stations > > +config CFG80211_REG_SOFT_CONFIGURATIONS Please use something specific to P2P, maybe CFG80211_REG_P2P_RELAX or something. It would be good to also provide a reference to a URL on wireless.kernel.org on documentation about an example userspace instance or effort that is doing this. > diff --git a/net/wireless/chan.c b/net/wireless/chan.c > index 78559b5..d47856b 100644 > --- a/net/wireless/chan.c > +++ b/net/wireless/chan.c > @@ -605,15 +605,77 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, > } > EXPORT_SYMBOL(cfg80211_chandef_usable); > > +#ifdef CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS Please use config_enabled(CONFIG_FOO) check to simplify this. > +/* For GO only, check if the channel can be used under permissive conditions > + * mandated by the some regulatory bodies, i.e., the channel is marked with > + * 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). > + */ Comments go like this: /* * somet suff * bladsf */ > +static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, > + struct ieee80211_channel *chan) > +{ > + struct wireless_dev *wdev_iter; > + > + ASSERT_RTNL(); > + > + if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) > + return false; > + > + list_for_each_entry(wdev_iter, &rdev->wdev_list, list) { > + struct ieee80211_channel *other_chan = NULL; > + > + if (wdev_iter->iftype != NL80211_IFTYPE_STATION || > + !netif_running(wdev_iter->netdev)) > + continue; > + <-- > + wdev_lock(wdev_iter); > + if (wdev_iter->current_bss) > + other_chan = wdev_iter->current_bss->pub.channel; > + wdev_unlock(wdev_iter); --> This is begging to be added as a helper. > + > + if (!other_chan) > + continue; > + > + if (chan == other_chan) { > + return true; No need to use braces for one liners and since you are returning no need to indent the code below, as the else is implicit. This in practice helps reduce general code identation. Likeywise you can follow by a check for ! 5 GHz and bail if, and save yourself the identation on the negative. > +static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, > + struct ieee80211_channel *chan) > +{ > + return false; > +} > +#endif /* CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS */ Please review chan.c well and make a call (you decide) if this belongs on chan.c or reg.c. > + > bool cfg80211_reg_can_beacon(struct wiphy *wiphy, > - struct cfg80211_chan_def *chandef) > + struct cfg80211_chan_def *chandef, > + enum nl80211_iftype iftype) > { > + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); > bool res; > u32 prohibited_flags = IEEE80211_CHAN_DISABLED | > - IEEE80211_CHAN_NO_IR | > IEEE80211_CHAN_RADAR; > > - trace_cfg80211_reg_can_beacon(wiphy, chandef); > + trace_cfg80211_reg_can_beacon(wiphy, chandef, iftype); > + > + /* Under certain conditions suggested by the some regulatory bodies > + * a GO can operate on channels marked with IEEE80211_NO_IR > + * so set this flag only if such relaxations are not enabled and > + * the conditions are not met. Comment style. > + */ > + if (iftype != NL80211_IFTYPE_P2P_GO || > + !cfg80211_go_permissive_chan(rdev, chandef->chan)) > + prohibited_flags |= IEEE80211_CHAN_NO_IR; Please add a wiphy regulatory feature flag here that allows device drivers to disable this, this can be enabled by default. Practice shows regulatory stuff varies and I can imagine other vendors wanting to consider disabling for some customers or builds for whatever unestablished reasons. > diff --git a/net/wireless/reg.h b/net/wireless/reg.h > index cc4c2c0..1ef2daa 100644 > --- a/net/wireless/reg.h > +++ b/net/wireless/reg.h > @@ -102,4 +102,16 @@ void regulatory_hint_country_ie(struct wiphy *wiphy, > */ > void regulatory_hint_disconnect(void); > > +/** > + * cfg80211_get_unii - get a value specifying the U-NII band the frequency > + * belongs too. One liners for top description on kdoc IIRC. > + * @freq: the frequency for which we want to get the UNII band. > + > + * U-NII bands are defined by the FCC in C.F.R 47 part 15. > + * > + * Returns -EINVAL if freq is invalid, 1 for UNII-1, 2 for UNII-2, > + * 3 for UNII-2e, 4 for UNII-3. What's your source for UNII definition? Can you provide a URL? 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
Hi Luis, Thanks for your comments. Ilan. > From: Luis R. Rodriguez [mailto:mcgrof@gmail.com] On Behalf Of Luis R. > Rodriguez > Sent: Saturday, January 25, 2014 02:09 > To: Peer, Ilan > Cc: linux-wireless@vger.kernel.org; wireless-regdb@lists.infradead.org > Subject: Re: [PATCH v2 3/6] cfg80211: Enable GO operation on additional > channels > > > It is assumed that such restrictions are enforced by user space. > > Furthermore, it is assumed, that if the conditions that allowed for > > the operation of the GO on such a channel change, i.e., the station > > interface disconnected from the AP, it is the responsibility of user > > space to evacuate the GO from the channel. > > You may be interested in perhaps picking up my regulatory quiescing patch. > Can you check and let me know? > Sure. Will have a look. > > +config CFG80211_REG_SOFT_CONFIGURATIONS > > Please use something specific to P2P, maybe CFG80211_REG_P2P_RELAX or > something. It would be good to also provide a reference to a URL on > wireless.kernel.org on documentation about an example userspace instance > or effort that is doing this. > Will change the config name. As for the documentation, do you mean something like what I've added to the cover letter? Anyway, I will handle this once these patches are accepted. > > > > +#ifdef CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS > > Please use config_enabled(CONFIG_FOO) check to simplify this. Sure. > > > +/* For GO only, check if the channel can be used under permissive > > +conditions > > + * mandated by the some regulatory bodies, i.e., the channel is > > +marked with > > + * 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). > > + */ > > Comments go like this: > > /* > * somet suff > * bladsf > */ > I thought I was following the networking comment style :) anyway .. fixing. > > <-- > > > + wdev_lock(wdev_iter); > > + if (wdev_iter->current_bss) > > + other_chan = wdev_iter->current_bss- > >pub.channel; > > + wdev_unlock(wdev_iter); > > --> > > This is begging to be added as a helper. > Sure. > > + > > + if (!other_chan) > > + continue; > > + > > + if (chan == other_chan) { > > + return true; > > No need to use braces for one liners and since you are returning no need to > indent the code below, as the else is implicit. This in practice helps reduce > general code identation. > > Likeywise you can follow by a check for ! 5 GHz and bail if, and save yourself > the identation on the negative. > Fixing > > +static bool cfg80211_go_permissive_chan(struct > cfg80211_registered_device *rdev, > > + struct ieee80211_channel *chan) > > +{ > > + return false; > > +} > > +#endif /* CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS */ > > Please review chan.c well and make a call (you decide) if this belongs on > chan.c or reg.c. > I think that it is more suited in chan.c (similar to dfs handling ...). > > + /* Under certain conditions suggested by the some regulatory bodies > > + * a GO can operate on channels marked with IEEE80211_NO_IR > > + * so set this flag only if such relaxations are not enabled and > > + * the conditions are not met. > > Comment style. Fixing ... > > > + */ > > + if (iftype != NL80211_IFTYPE_P2P_GO || > > + !cfg80211_go_permissive_chan(rdev, chandef->chan)) > > + prohibited_flags |= IEEE80211_CHAN_NO_IR; > > Please add a wiphy regulatory feature flag here that allows device drivers to > disable this, this can be enabled by default. > Practice shows regulatory stuff varies and I can imagine other vendors > wanting to consider disabling for some customers or builds for whatever > unestablished reasons. > Sure. > > +/** > > + * cfg80211_get_unii - get a value specifying the U-NII band the > > +frequency > > + * belongs too. > > One liners for top description on kdoc IIRC. > Fixing. > > + * @freq: the frequency for which we want to get the UNII band. > > + > > + * U-NII bands are defined by the FCC in C.F.R 47 part 15. > > + * > > + * Returns -EINVAL if freq is invalid, 1 for UNII-1, 2 for UNII-2, > > + * 3 for UNII-2e, 4 for UNII-3. > > What's your source for UNII definition? Can you provide a URL? > FCC in C.F.R 47 part 15 ... WIP to get the URL. -- 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
> -----Original Message----- > From: Luis R. Rodriguez [mailto:mcgrof@gmail.com] On Behalf Of Luis R. > Rodriguez > Sent: Saturday, January 25, 2014 02:09 > To: Peer, Ilan > Cc: linux-wireless@vger.kernel.org; wireless-regdb@lists.infradead.org > Subject: Re: [PATCH v2 3/6] cfg80211: Enable GO operation on additional > channels > > > <-- > > > + wdev_lock(wdev_iter); > > + if (wdev_iter->current_bss) > > + other_chan = wdev_iter->current_bss- > >pub.channel; > > + wdev_unlock(wdev_iter); > > --> > > This is begging to be added as a helper. Rethinking this ... currently this is not really used by other code paths other than the wext ones. Do u still want the helper function? Ilan. -- 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
Hi Luis, Adding the link to the latest definitions of FCC's 5GHz unlicensed spectrum. Regards, Ilan. > -----Original Message----- > From: Luis R. Rodriguez [mailto:mcgrof@gmail.com] On Behalf Of Luis R. > Rodriguez > Sent: Saturday, January 25, 2014 02:09 > To: Peer, Ilan > Cc: linux-wireless@vger.kernel.org; wireless-regdb@lists.infradead.org > Subject: Re: [PATCH v2 3/6] cfg80211: Enable GO operation on additional > channels > ... > > + * @freq: the frequency for which we want to get the UNII band. > > + > > + * U-NII bands are defined by the FCC in C.F.R 47 part 15. > > + * > > + * Returns -EINVAL if freq is invalid, 1 for UNII-1, 2 for UNII-2, > > + * 3 for UNII-2e, 4 for UNII-3. > > What's your source for UNII definition? Can you provide a URL? > http://www.fcc.gov/document/5-ghz-unlicensed-spectrum-unii http://hraunfoss.fcc.gov/edocs_public/attachmatch/FCC-13-22A1.pdf -- 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/include/net/cfg80211.h b/include/net/cfg80211.h index f4289db..504d656 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4297,12 +4297,14 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy, * cfg80211_reg_can_beacon - check if beaconing is allowed * @wiphy: the wiphy * @chandef: the channel definition + * @iftype: interface type * * Return: %true if there is no secondary channel or the secondary channel(s) * can be used for beaconing (i.e. is not a radar channel etc.) */ bool cfg80211_reg_can_beacon(struct wiphy *wiphy, - struct cfg80211_chan_def *chandef); + struct cfg80211_chan_def *chandef, + enum nl80211_iftype iftype); /* * cfg80211_ch_switch_notify - update wdev channel and notify userspace diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 2eda7b1..9d5688d 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -263,7 +263,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, /* make a copy of the chandef, it could be modified below. */ chandef = *req_chandef; chan = chandef.chan; - if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) { + if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef, + NL80211_IFTYPE_ADHOC)) { if (chandef.width == NL80211_CHAN_WIDTH_5 || chandef.width == NL80211_CHAN_WIDTH_10 || chandef.width == NL80211_CHAN_WIDTH_20_NOHT || @@ -275,7 +276,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, chandef.width = NL80211_CHAN_WIDTH_20; chandef.center_freq1 = chan->center_freq; /* check again for downgraded chandef */ - if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) { + if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef, + NL80211_IFTYPE_ADHOC)) { sdata_info(sdata, "Failed to join IBSS, beacons forbidden\n"); return; @@ -865,7 +867,8 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, goto disconnect; } - if (!cfg80211_reg_can_beacon(sdata->local->hw.wiphy, ¶ms.chandef)) { + if (!cfg80211_reg_can_beacon(sdata->local->hw.wiphy, ¶ms.chandef, + NL80211_IFTYPE_ADHOC)) { sdata_info(sdata, "IBSS %pM switches to unsupported channel (%d MHz, width:%d, CF1/2: %d/%d MHz), disconnecting\n", ifibss->bssid, diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 81c05e4..f4012fc 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -102,6 +102,15 @@ config CFG80211_REG_CELLULAR_HINTS This option adds support for drivers that can receive regulatory hints from cellular base stations +config CFG80211_REG_SOFT_CONFIGURATIONS + bool "cfg80211 support for GO operation on additional channels" + depends on CFG80211_CERTIFICATION_ONUS + ---help--- + This option enables the operation of a P2P group owner on + additional channels, if there is an additional BSS interface + which is connected to an AP which is assumed to be an authorized + master, i.e., with radar detection support and DFS capabilities + config CFG80211_DEFAULT_PS bool "enable powersave by default" depends on CFG80211 diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 78559b5..d47856b 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -605,15 +605,77 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, } EXPORT_SYMBOL(cfg80211_chandef_usable); +#ifdef CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS +/* For GO only, check if the channel can be used under permissive conditions + * mandated by the some regulatory bodies, i.e., the channel is marked with + * 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). + */ +static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, + struct ieee80211_channel *chan) +{ + struct wireless_dev *wdev_iter; + + ASSERT_RTNL(); + + if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) + return false; + + list_for_each_entry(wdev_iter, &rdev->wdev_list, list) { + struct ieee80211_channel *other_chan = NULL; + + if (wdev_iter->iftype != NL80211_IFTYPE_STATION || + !netif_running(wdev_iter->netdev)) + continue; + + wdev_lock(wdev_iter); + if (wdev_iter->current_bss) + other_chan = wdev_iter->current_bss->pub.channel; + wdev_unlock(wdev_iter); + + if (!other_chan) + continue; + + if (chan == other_chan) { + return true; + } else if (chan->band == IEEE80211_BAND_5GHZ) { + int r1 = cfg80211_get_unii(chan->center_freq); + int r2 = cfg80211_get_unii(other_chan->center_freq); + + if (r1 != -EINVAL && r1 == r2) + return true; + } + } + return false; +} +#else +static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, + struct ieee80211_channel *chan) +{ + return false; +} +#endif /* CONFIG_CFG80211_REG_SOFT_CONFIGURATIONS */ + bool cfg80211_reg_can_beacon(struct wiphy *wiphy, - struct cfg80211_chan_def *chandef) + struct cfg80211_chan_def *chandef, + enum nl80211_iftype iftype) { + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); bool res; u32 prohibited_flags = IEEE80211_CHAN_DISABLED | - IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR; - trace_cfg80211_reg_can_beacon(wiphy, chandef); + trace_cfg80211_reg_can_beacon(wiphy, chandef, iftype); + + /* Under certain conditions suggested by the some regulatory bodies + * a GO can operate on channels marked with IEEE80211_NO_IR + * so set this flag only if such relaxations are not enabled and + * the conditions are not met. + */ + if (iftype != NL80211_IFTYPE_P2P_GO || + !cfg80211_go_permissive_chan(rdev, chandef->chan)) + prohibited_flags |= IEEE80211_CHAN_NO_IR; if (cfg80211_chandef_dfs_required(wiphy, chandef) > 0 && cfg80211_chandef_dfs_available(wiphy, chandef)) { diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index b0e1869..925c920 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -174,7 +174,8 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, scan_width); } - if (!cfg80211_reg_can_beacon(&rdev->wiphy, &setup->chandef)) + if (!cfg80211_reg_can_beacon(&rdev->wiphy, &setup->chandef, + NL80211_IFTYPE_MESH_POINT)) return -EINVAL; err = cfg80211_can_use_chan(rdev, wdev, setup->chandef.chan, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 31bc8c7..267d37e 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1870,7 +1870,7 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev, result = -EBUSY; break; } - if (!cfg80211_reg_can_beacon(&rdev->wiphy, &chandef)) { + if (!cfg80211_reg_can_beacon(&rdev->wiphy, &chandef, iftype)) { result = -EINVAL; break; } @@ -3219,7 +3219,8 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) } else if (!nl80211_get_ap_channel(rdev, ¶ms)) return -EINVAL; - if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef)) + if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef, + wdev->iftype)) return -EINVAL; err = cfg80211_chandef_dfs_required(wdev->wiphy, ¶ms.chandef); @@ -5806,7 +5807,8 @@ skip_beacons: if (err) return err; - if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef)) + if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef, + wdev->iftype)) return -EINVAL; if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP || @@ -6577,7 +6579,8 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) if (err) return err; - if (!cfg80211_reg_can_beacon(&rdev->wiphy, &ibss.chandef)) + if (!cfg80211_reg_can_beacon(&rdev->wiphy, &ibss.chandef, + NL80211_IFTYPE_ADHOC)) return -EINVAL; switch (ibss.chandef.width) { diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 2449dce..212b5c2 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2460,6 +2460,28 @@ static void reg_timeout_work(struct work_struct *work) rtnl_unlock(); } +int cfg80211_get_unii(int freq) +{ + /* UNII-1 */ + if (freq >= 5150 && freq <= 5250) + return 0; + + /* UNII-2 */ + if (freq > 5250 && freq <= 5350) + return 1; + + /* UNII-2E */ + if (freq >= 5470 && freq <= 5725) + return 2; + + /* UNII-3 */ + if (freq > 5725 && freq <= 5825) + return 3; + + WARN_ON(1); + return -EINVAL; +} + int __init regulatory_init(void) { int err = 0; diff --git a/net/wireless/reg.h b/net/wireless/reg.h index cc4c2c0..1ef2daa 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -102,4 +102,16 @@ void regulatory_hint_country_ie(struct wiphy *wiphy, */ void regulatory_hint_disconnect(void); +/** + * cfg80211_get_unii - get a value specifying the U-NII band the frequency + * belongs too. + * @freq: the frequency for which we want to get the UNII band. + + * U-NII bands are defined by the FCC in C.F.R 47 part 15. + * + * Returns -EINVAL if freq is invalid, 1 for UNII-1, 2 for UNII-2, + * 3 for UNII-2e, 4 for UNII-3. + */ +int cfg80211_get_unii(int freq); + #endif /* __NET_WIRELESS_REG_H */ diff --git a/net/wireless/trace.h b/net/wireless/trace.h index f7aa7a7..6687712 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -2149,18 +2149,21 @@ TRACE_EVENT(cfg80211_cqm_rssi_notify, ); TRACE_EVENT(cfg80211_reg_can_beacon, - TP_PROTO(struct wiphy *wiphy, struct cfg80211_chan_def *chandef), - TP_ARGS(wiphy, chandef), + TP_PROTO(struct wiphy *wiphy, struct cfg80211_chan_def *chandef, + enum nl80211_iftype iftype), + TP_ARGS(wiphy, chandef, iftype), TP_STRUCT__entry( WIPHY_ENTRY CHAN_DEF_ENTRY + __field(enum nl80211_iftype, iftype) ), TP_fast_assign( WIPHY_ASSIGN; CHAN_DEF_ASSIGN(chandef); + __entry->iftype = iftype; ), - TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT, - WIPHY_PR_ARG, CHAN_DEF_PR_ARG) + TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT ", iftype=%d", + WIPHY_PR_ARG, CHAN_DEF_PR_ARG, __entry->iftype) ); TRACE_EVENT(cfg80211_chandef_dfs_required,
Allow GO operation on a channel marked with IEEE80211_CHAN_GO_CONCURRENT iff there is an active station interface that is associated to an AP operating on the same channel in 2.4 or the same UNII band in 5.2 (assuming that the AP is an authorized master) Note that this is a permissive approach to the FCC definitions, that require a clear assessment that the device operating the AP is an authorized master, i.e., with radar detection and DFS capabilities. It is assumed that such restrictions are enforced by user space. Furthermore, it is assumed, that if the conditions that allowed for the operation of the GO on such a channel change, i.e., the station interface disconnected from the AP, it is the responsibility of user space to evacuate the GO from the channel. Signed-off-by: Ilan Peer <ilan.peer@intel.com> --- include/net/cfg80211.h | 4 ++- net/mac80211/ibss.c | 9 ++++--- net/wireless/Kconfig | 9 +++++++ net/wireless/chan.c | 68 +++++++++++++++++++++++++++++++++++++++++++++--- net/wireless/mesh.c | 3 ++- net/wireless/nl80211.c | 11 +++++--- net/wireless/reg.c | 22 ++++++++++++++++ net/wireless/reg.h | 12 +++++++++ net/wireless/trace.h | 11 +++++--- 9 files changed, 133 insertions(+), 16 deletions(-)