On Wed, Aug 14, 2019 at 09:59:14AM -0700, Brian Norris wrote:
> [ Upstream commit df612421fe2566654047769c6852ffae1a31df16 ]
>
> Commit 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant
> vendor IEs") adjusted the ieee_types_vendor_header struct, which
> inadvertently messed up the offsets used in
> mwifiex_is_wpa_oui_present(). Add that offset back in, mirroring
> mwifiex_is_rsn_oui_present().
>
> As it stands, commit 63d7ef36103d breaks compatibility with WPA (not
> WPA2) 802.11n networks, since we hit the "info: Disable 11n if AES is
> not supported by AP" case in mwifiex_is_network_compatible().
>
> Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor IEs")
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx>
> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/mwifiex/main.h | 1 +
> drivers/net/wireless/mwifiex/scan.c | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
Now queued up, thanks for the backport.
greg k-h
