瀏覽代碼

qcacmn: Fix compilation issues in connection manager

Fix compilation issues in connection manager.

Change-Id: I5cde57a97fedca06c5f953e550ccbce7890d61f1
CRs-Fixed: 2801018
gaurank kathpalia 4 年之前
父節點
當前提交
341f2d3643

+ 2 - 1
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c

@@ -382,8 +382,9 @@ void cm_calculate_scores(struct wlan_objmgr_pdev *pdev,
 static inline void cm_delete_pmksa_for_bssid(struct cnx_mgr *cm_ctx,
 					     struct qdf_mac_addr *bssid)
 {
-	struct wlan_crypto_pmksa pmksa = {0};
+	struct wlan_crypto_pmksa pmksa;
 
+	qdf_mem_zero(&pmksa, sizeof(pmksa));
 	qdf_copy_macaddr(&pmksa.bssid, bssid);
 	wlan_crypto_set_del_pmksa(cm_ctx->vdev, &pmksa, false);
 }

+ 5 - 2
umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_public_struct.h

@@ -81,7 +81,6 @@ struct wlan_cm_connect_crypto_info {
 #define WLAN_CM_FILS_MAX_KEYNAME_NAI_LENGTH 253
 #define WLAN_CM_FILS_MAX_REALM_LEN 255
 #define WLAN_CM_FILS_MAX_RRK_LENGTH 64
-#define WLAN_CM_FILS_MAX_RIK_LENGTH CM_FILS_MAX_RRK_LENGTH
 
 /**
  * struct wlan_fils_con_info - fils connect req info
@@ -113,7 +112,10 @@ struct wlan_fils_con_info {
  * @CM_OSIF_DISCONNECT: Disconnect req initiated by OSIF or north bound
  * @CM_PEER_DISCONNECT: Disconnect req initiated by peer sending deauth/disassoc
  * only for this localy generated will be false while indicating to kernel
- * @CM_SB_DISCONNECT: Disconnect req initiated by South bound/VDEV mgr/Peer mgr
+ * @CM_SB_DISCONNECT: Disconnect initiated from firmware. eg HB failure,
+ * sta kickout etc
+ * @CM_MLME_DISCONNECT: Disconnect req initiated by mlme. eg VDEV mgr or any
+ * other mlme component.
  * @CM_INTERNAL_DISCONNECT: Internal disconnect initiated by Connection manager
  * on receiving the back to back commands
  * @CM_ROAM_DISCONNECT: Disconnect req due to HO failure
@@ -126,6 +128,7 @@ enum wlan_cm_source {
 	CM_OSIF_DISCONNECT,
 	CM_PEER_DISCONNECT,
 	CM_SB_DISCONNECT,
+	CM_MLME_DISCONNECT,
 	CM_INTERNAL_DISCONNECT,
 	CM_ROAM_DISCONNECT,
 	CM_SOURCE_MAX,