Re: pull-request: wireless-next-2022-10-28

[Kalle Valo <kvalo@kernel.org>]

Kalle Valo <kvalo@kernel.org> writes:

> Note: wireless tree was merged[1] to wireless-next to avoid some
> conflicts with mac80211 patches between the trees. Unfortunately there
> are still two smaller conflicts in net/mac80211/util.c which Stephen
> also reported[2]. In the first conflict initialise scratch_len to
> "params->scratch_len ?: 3 * params->len" (note number 3, not 2!) and
> in the second conflict take the version which uses elems->scratch_pos.
>
> Git diff output should like this:
>
> --- a/net/mac80211/util.c
> +++ b/net/mac80211/util.c
> @@@ -1506,7 -1648,7 +1650,7 @@@ ieee802_11_parse_elems_full(struct ieee
>         const struct element *non_inherit = NULL;
>         u8 *nontransmitted_profile;
>         int nontransmitted_profile_len = 0;
> -       size_t scratch_len = params->len;
>  -      size_t scratch_len = params->scratch_len ?: 2 * params->len;
> ++      size_t scratch_len = params->scratch_len ?: 3 * params->len;
>
>         elems = kzalloc(sizeof(*elems) + scratch_len, GFP_ATOMIC);
>         if (!elems)

And in case want to see the final result, here's an example merge I
pushed to our pending branch:

https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git/tree/net/mac80211/util.c?h=pending&id=0879f594289e36546974c17f10bf587d9303e724#n1646

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches