On Fri, 2014-03-21 at 14:52 +0100, Michal Kazior wrote:
> Channel switch finalization is now 2-step. First
> step is when driver calls csa_finish(), the other
> is when reservation is actually finalized (which
> be defered for in-place reservation).
>
> This implies driver must not call csa_finish()
> more than once for each channel_switch request.
>
> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx>
> ---
> net/mac80211/cfg.c | 62 ++++++++++++++++++++++++++++++++++++-----------------
> net/mac80211/chan.c | 11 +++++++++-
> 2 files changed, 52 insertions(+), 21 deletions(-)
>
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 0c68269..ba544d3 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -3096,17 +3096,25 @@ static int ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)
>
> sdata_assert_lock(sdata);
> lockdep_assert_held(&local->mtx);
> + lockdep_assert_held(&local->mtx);
duplicate
> - sdata->radar_required = sdata->csa_radar_required;
> - err = ieee80211_vif_change_channel(sdata, &changed);
> - if (WARN_ON(err < 0))
> - return err;
> + /* using reservation isn't immediate as it may be deferred until later
> + * with multi-vif. once reservation is complete it will re-schedule the
> + * work with no reserved_chanctx so verify chandef to check if it
> + * completed successfully */
style issue here also
> - if (num_chanctx > 1)
> - return -EBUSY;
> + err = ieee80211_vif_reserve_chanctx(sdata, ¶ms->chandef,
> + chanctx->mode,
> + params->radar_required);
> + if (err) {
> + mutex_unlock(&local->chanctx_mtx);
> + return err;
> + }
>
> - /* don't allow another channel switch if one is already active. */
> - if (sdata->vif.csa_active)
> - return -EBUSY;
> + /* if reservation is invalid then this will fail */
> + err = ieee80211_check_combinations(sdata, NULL, chanctx->mode, 0);
> + if (err) {
> + ieee80211_vif_unreserve_chanctx(sdata);
> + mutex_unlock(&local->chanctx_mtx);
> + return err;
> + }
>
> err = ieee80211_set_csa_beacon(sdata, params, &changed);
> - if (err)
> + if (err) {
> + ieee80211_vif_unreserve_chanctx(sdata);
> + mutex_unlock(&local->chanctx_mtx);
> return err;
> + }
All those error cases could be converted to 'goto' instead of
duplicating the unlock/unreserve.
johannes
--
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
