Przeglądaj źródła

qcacmn: Update assoc resp ie len and ptr in connect response

Update assoc resp ie len and ptr in connect response

Change-Id: I31f175da43fe1548aa9621320339bd242c8d67d1
Himanshu Batra 4 lat temu
rodzic
commit
4aa4060acf
1 zmienionych plików z 5 dodań i 20 usunięć
  1. 5 20
      os_if/linux/mlme/src/osif_cm_connect_rsp.c

+ 5 - 20
os_if/linux/mlme/src/osif_cm_connect_rsp.c

@@ -43,22 +43,7 @@ void osif_cm_get_assoc_req_ie_data(struct element_info *assoc_req,
 	*ie_data_len = assoc_req->len - WLAN_ASSOC_REQ_IES_OFFSET;
 	*ie_data_ptr = assoc_req->ptr + WLAN_ASSOC_REQ_IES_OFFSET;
 }
-
-void osif_cm_get_assoc_rsp_ie_data(struct element_info *assoc_rsp,
-				   size_t *ie_data_len,
-				   const uint8_t **ie_data_ptr)
-{
-	/* Validate IE and length */
-	if (!assoc_rsp->len || !assoc_rsp->ptr ||
-	    assoc_rsp->len <= WLAN_ASSOC_RSP_IES_OFFSET)
-		return;
-
-	*ie_data_len = assoc_rsp->len - WLAN_ASSOC_RSP_IES_OFFSET;
-	*ie_data_ptr = assoc_rsp->ptr + WLAN_ASSOC_RSP_IES_OFFSET;
-}
-
 #else
-
 void osif_cm_get_assoc_req_ie_data(struct element_info *assoc_req,
 				   size_t *ie_data_len,
 				   const uint8_t **ie_data_ptr)
@@ -70,21 +55,21 @@ void osif_cm_get_assoc_req_ie_data(struct element_info *assoc_req,
 	*ie_data_len = assoc_req->len;
 	*ie_data_ptr = assoc_req->ptr;
 }
+#endif
 
 void osif_cm_get_assoc_rsp_ie_data(struct element_info *assoc_rsp,
 				   size_t *ie_data_len,
 				   const uint8_t **ie_data_ptr)
 {
 	/* Validate IE and length */
-	if (!assoc_rsp->len || !assoc_rsp->ptr)
+	if (!assoc_rsp->len || !assoc_rsp->ptr ||
+	    assoc_rsp->len <= WLAN_ASSOC_RSP_IES_OFFSET)
 		return;
 
-	*ie_data_len = assoc_rsp->len;
-	*ie_data_ptr = assoc_rsp->ptr;
+	*ie_data_len = assoc_rsp->len - WLAN_ASSOC_RSP_IES_OFFSET;
+	*ie_data_ptr = assoc_rsp->ptr + WLAN_ASSOC_RSP_IES_OFFSET;
 }
 
-#endif
-
 /**
  * osif_validate_connect_and_reset_src_id() - Validate connect response and
  * resets source and id