Преглед на файлове

qcacld-3.0: Fix HT IE missing in Beacons when WPA/WPA2 Mixed mode

According to 11n CERT case - 4.2.44 AP WAP/WPA2 mixed security mode
test, AP works in HT mode, but driver disallow the 11n when TKIP
cipher present and switch to "A" mode, then no HT IE in Beacon.
Fix by check TKIP only cipher and other ciphter present(CCM)
to disable allow 11n.

Change-Id: Ia915c9aa45bef93a22b5f43004e533cc87978752
CRs-Fixed: 3033301
Liangwei Dong преди 3 години
родител
ревизия
39e516f7d2
променени са 1 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. 8 3
      components/mlme/core/src/wlan_mlme_main.c

+ 8 - 3
components/mlme/core/src/wlan_mlme_main.c

@@ -2965,9 +2965,14 @@ bool wlan_vdev_id_is_11n_allowed(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
 	if (QDF_HAS_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_TKIP) ||
 	    QDF_HAS_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP) ||
 	    QDF_HAS_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP_40) ||
-	    QDF_HAS_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP_104))
-		is_11n_allowed = false;
-
+	    QDF_HAS_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP_104)) {
+		QDF_CLEAR_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_TKIP);
+		QDF_CLEAR_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP);
+		QDF_CLEAR_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP_40);
+		QDF_CLEAR_PARAM(ucast_cipher, WLAN_CRYPTO_CIPHER_WEP_104);
+		if (!ucast_cipher)
+			is_11n_allowed = false;
+	}
 err:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);