Re: [PATCH v3 1/3] wifi: mwifiex: simplify WPA flags setting

[Kalle Valo]

Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:

> The WPA flags setting only depends on the wpa_versions bitfield and not
> on the AKM suite, so move it out of the switch/case to simplify the code
> a bit. Also set bss_config->protocol to zero explicitly. This is done
> only to make the code clearer, bss_config has been zero alloced by the
> caller, so should be zero already. No functional change intended.
> 
> Reviewed-by: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx>
> Acked-by: Brian Norris <briannorris@xxxxxxxxxxxx>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

There were conflicts on wireless-next, please rebase.

Recorded preimage for 'drivers/net/wireless/marvell/mwifiex/fw.h'
Recorded preimage for 'drivers/net/wireless/marvell/mwifiex/uap_cmd.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: wifi: mwifiex: add support for WPA-PSK-SHA256
Using index info to reconstruct a base tree...
M	drivers/net/wireless/marvell/mwifiex/fw.h
M	drivers/net/wireless/marvell/mwifiex/uap_cmd.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/marvell/mwifiex/uap_cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/uap_cmd.c
Auto-merging drivers/net/wireless/marvell/mwifiex/fw.h
CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/fw.h
Patch failed at 0001 wifi: mwifiex: add support for WPA-PSK-SHA256

3 patches set to Changes Requested.

13739655 [v3,1/3] wifi: mwifiex: simplify WPA flags setting
13739654 [v3,2/3] wifi: mwifiex: fix key_mgmt setting
13739653 [v3,3/3] wifi: mwifiex: add support for WPA-PSK-SHA256

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20240723-mwifiex-wpa-psk-sha256-v3-1-025168a91da1@xxxxxxxxxxxxxx/

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