On Wed, 2014-02-19 at 12:51 +0100, Michal Kazior wrote: > On 19 February 2014 11:00, Luciano Coelho <luca@xxxxxxxxx> wrote: > > From: Luciano Coelho <luciano.coelho@xxxxxxxxx> > > > > Move the counting part of the interface combination check from > > cfg80211 to mac80211. > > > > This is needed to simplify locking when the driver has to perform a > > combination check by itself (eg. with channel-switch). > > > > Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx> > > --- > > [...] > > > @@ -520,6 +521,23 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, > > WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev)); > > > > mutex_lock(&local->chanctx_mtx); > > + > > + radar_detect_width = cfg80211_chandef_dfs_required(local->hw.wiphy, > > + chandef, > > + sdata->vif.type); > > + if (radar_detect_width < 0) { > > + ret = radar_detect_width; > > + goto out; > > + } > > + > > + sdata->radar_required = !!(radar_detect_width); > > + > > + ret = ieee80211_check_combinations(local->hw.wiphy, &sdata->wdev, > > + chandef, IEEE80211_CHANCTX_SHARED, > > + radar_detect_width); > > + if (ret < 0) > > + goto out; > > + > > Shouldn't you be using `mode` function argument instead of > IEEE80211_CHANCTX_SHARED? Good catch! Someone is paying attention, apparently *I* was not. :P I'll fix it in v2. -- Luca. -- 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