On Wed, Nov 13, 2013 at 10:29:33PM +0100, Johannes Berg wrote: > On Wed, 2013-11-13 at 19:12 +0100, Luis R. Rodriguez wrote: > > Check the DFS region before channel availability check > > or declaring a channel as DFS usable. > > > > Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx> > > --- > > net/wireless/chan.c | 8 ++++++++ > > net/wireless/nl80211.c | 5 +++++ > > 2 files changed, 13 insertions(+) > > > > diff --git a/net/wireless/chan.c b/net/wireless/chan.c > > index 78559b5..4e6eaa0 100644 > > --- a/net/wireless/chan.c > > +++ b/net/wireless/chan.c > > @@ -517,10 +517,18 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, > > struct ieee80211_sta_ht_cap *ht_cap; > > struct ieee80211_sta_vht_cap *vht_cap; > > u32 width, control_freq; > > + enum nl80211_dfs_regions dfs_region; > > > > if (WARN_ON(!cfg80211_chandef_valid(chandef))) > > return false; > > > > + rtnl_lock(); > > + dfs_region = reg_get_dfs_region(wiphy); > > + rtnl_unlock(); > > This I'm fairly sure will just deadlock. OK :D Januz seems to note this may not be required anyway too, so hopefully that's true. > Anyway, this and patch 4 together can be done MUCH simpler by just > having the driver advertise the bitmap of what it supports before > registration, and then not using it if CERTIFICATION_ONUS isn't enabled > or something. OK, good idea. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html