Re: [PATCH v4 4/4] cfg80211/mac80211: move combination check to mac80211 for ibss

[Michal Kazior <michal.kazior@xxxxxxxxx>]

On 24 February 2014 21:54, Luciano Coelho <luca@xxxxxxxxx> wrote:
> From: Luciano Coelho <luciano.coelho@xxxxxxxxx>
>
> Now that mac80211 can check the interface combinations itself, move
> the combinations check from cfg80211 to mac80211 when joining an IBSS.
>
> Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
> ---
> In v2:
>
>    * lock the chanctx mutex in ieee80211_ibss_join() before calling
>      ieee80211_check_combinations(). (Thanks Michal);
>
>    * pass the mode argument instead of IEEE80211_CHANCTX_SHARED to
>      ieee80211_check_combinations() in ieee80211_vif_use_channel();
>
> In v3:
>
>    * moved the second change from v2 (pass the mode argument...) to
>      the previous patch, where it should be;
>
> In v4:
>
>    * rebased on top of slightly modified applied patches
> ---
>  net/mac80211/ibss.c | 30 +++++++++++++++++++++++++++---
>  net/wireless/ibss.c | 28 ----------------------------
>  2 files changed, 27 insertions(+), 31 deletions(-)
>
> diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> index bca7d09..745b445 100644
> --- a/net/mac80211/ibss.c
> +++ b/net/mac80211/ibss.c
> @@ -1643,7 +1643,31 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
>         u32 changed = 0;
>         u32 rate_flags;
>         struct ieee80211_supported_band *sband;
> +       enum ieee80211_chanctx_mode chanmode;
> +       struct ieee80211_local *local = sdata->local;
> +       int radar_detect_width;
>         int i;
> +       int ret;
> +
> +       radar_detect_width = cfg80211_chandef_dfs_required(local->hw.wiphy,
> +                                                          &params->chandef,
> +                                                          sdata->vif.type);
> +       if (radar_detect_width < 0)
> +               return radar_detect_width;
> +
> +       if (radar_detect_width > 0 && !params->userspace_handles_dfs)
> +               return -EINVAL;
> +
> +       chanmode = (params->channel_fixed && !radar_detect_width) ?
> +               IEEE80211_CHANCTX_SHARED : IEEE80211_CHANCTX_EXCLUSIVE;
> +
> +       mutex_lock(&local->chanctx_mtx);
> +       ret = ieee80211_check_combinations(local->hw.wiphy, &sdata->wdev,
> +                                          &params->chandef, chanmode,
> +                                          radar_detect_width);

I think you forgot to update this call - you should be passing `local`
and `sdata` here, no?


Michał
--
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