OCV: Allow connecting MFP incapable OCV STA when OCV is disabled in AP

Skip check to mandate MFP capability for OCV enabled STA when OCV is
disabled in AP. This is to improve interoperability with STAs in which
OCV capability is advertised incorrectly without advertising MFP when
OCV is disabled in AP.

Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>

diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
index a7e6354a54f9952ec93f23e4ddcef9dcf1381b9e..3a16997cfec02eb896324534089799390d54ff0a 100644 (file)
--- a/src/ap/wpa_auth_ie.c
+++ b/src/ap/wpa_auth_ie.c
@@ -808,7 +808,7 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
 #endif /* CONFIG_SAE */
 
 #ifdef CONFIG_OCV
-       if ((data.capabilities & WPA_CAPABILITY_OCVC) &&
+       if (wpa_auth->conf.ocv && (data.capabilities & WPA_CAPABILITY_OCVC) &&
            !(data.capabilities & WPA_CAPABILITY_MFPC)) {
                wpa_printf(MSG_DEBUG,
                           "Management frame protection required with OCV, but client did not enable it");