On 27 February 2014 15:41, Luca Coelho <luca@xxxxxxxxx> wrote:
> From: Luciano Coelho <luciano.coelho@xxxxxxxxx>
>
> With single-channel drivers, we need to be able to change a running
> chanctx if we want to use chanctx reservation. Not all drivers may be
> able to do this, so add a flag that indicates support for it.
>
> Changing a running chanctx can also be used as an optimization in
> multi-channel drivers when the context needs to be reserved for future
> usage.
I think this can be generalized (not necessarily in this very patch).
Since you've moved combination checks into mac80211 you can easily
check how many channels you can have with current iftype setup. This
means you can know beforehand if you can create a new chanctx or have
to attempt a chanctx channel switch.
> Introduce IEEE80211_CHANCTX_RESERVED chanctx mode to mark a channel as
> reserved so nobody else can use it (since we know it's going to
> change). In the future, we may allow several vifs to use the same
> reservation as long as they plan to use the chanctx on the same
> future channel.
I don't really think you need a separate mode for that.
Since reserved_chanctx is protected by chanctx_mtx you can safely
iterate over interfaces and check if any vif is reserving the same
chanctx it is assigned to.
> @@ -622,7 +629,9 @@ int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata)
> if (WARN_ON(!sdata->reserved_chanctx))
> return -EINVAL;
>
> - if (--sdata->reserved_chanctx->refcount == 0)
> + if (sdata->reserved_chanctx->mode == IEEE80211_CHANCTX_RESERVED)
> + sdata->reserved_chanctx->mode = sdata->reserved_mode;
> + else if (--sdata->reserved_chanctx->refcount == 0)
> ieee80211_free_chanctx(sdata->local, sdata->reserved_chanctx);
>
> sdata->reserved_chanctx = NULL;
> @@ -652,19 +661,42 @@ int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,
> /* try to find another context with the chandef we want */
> new_ctx = ieee80211_find_chanctx(local, chandef,
> IEEE80211_CHANCTX_SHARED);
> - if (!new_ctx) {
> - /* create a new context */
> + if (new_ctx) {
> + /* reserve the existing compatible context */
> + sdata->reserved_chanctx = new_ctx;
> + new_ctx->refcount++;
> + } else if (curr_ctx->refcount == 1 &&
> + (local->hw.flags & IEEE80211_HW_CHANGE_RUNNING_CHANCTX)) {
> + /* TODO: when implementing support for multiple
> + * interfaces switching at the same time, we may want
> + * other vifs to reserve it as well, as long as
> + * they're planning to switch to the same channel. In
> + * that case, we probably have to save the future
> + * chandef and the reserved_mode in the context
> + * itself.
> + */
We already save the future chandef (csa_chandef). reserved_mode is not
necessary as per my comment above. Again, if you guarantee csa_chandef
to be set under chanctx_mtx you can safely iterate over interfaces and
calculate compat chandef.
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
