On Thu, 2014-02-27 at 11:14 +0200, Luca Coelho wrote:
> diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
> index 42c6592..2e537eb 100644
> --- a/net/mac80211/chan.c
> +++ b/net/mac80211/chan.c
> @@ -513,6 +513,7 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
> {
> struct ieee80211_local *local = sdata->local;
> struct ieee80211_chanctx *ctx;
> + u8 radar_detect_width;
> int ret;
>
> lockdep_assert_held(&local->mtx);
> @@ -520,6 +521,22 @@ 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(sdata, chandef, mode,
> + radar_detect_width);
> + if (ret < 0)
> + goto out;
I screwed up here during my interactive rebase to make
cfg80211_chandef_dfs_required() return 0 or 1 again. I should pass the
chandef's width to ieee80211_check_combinations() if radar detection is
required.
I'll send a v8 later today. *sigh*
--
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
