ソースを参照

qcacld-3.0: Stop peer assoc confirm timer in case of peer assoc failure

As part of tdls peer assoc request, WMI_SERVICE_PEER_ASSOC_CONF is
checked and a timer of 6 sec is started. But, in case of any failure
for peer assoc in host, This is not stopped and waited for timer to
expire and sends the response with failure status.

Stop the peer assoc confirm timer and send the add sta response with
failure status in case of any failure in host.

Change-Id: If6ba6aa1297afaea1fd86bf406dcbb6e4e461d25
CRs-Fixed: 2345086
Bala Venkatesh 6 年 前
コミット
fc0dfb7865
2 ファイル変更3 行追加6 行削除
  1. 0 6
      core/hdd/inc/wlan_hdd_main.h
  2. 3 0
      core/wma/src/wma_dev_if.c

+ 0 - 6
core/hdd/inc/wlan_hdd_main.h

@@ -237,12 +237,6 @@ enum hdd_driver_flags {
 /** Maximum time(ms) to wait for target to be ready for suspend **/
 /** Maximum time(ms) to wait for target to be ready for suspend **/
 #define WLAN_WAIT_TIME_READY_TO_SUSPEND  2000
 #define WLAN_WAIT_TIME_READY_TO_SUSPEND  2000
 
 
-/** Maximum time(ms) to wait for tdls add sta to complete **/
-#define WAIT_TIME_TDLS_ADD_STA      1500
-
-/** Maximum time(ms) to wait for tdls del sta to complete **/
-#define WAIT_TIME_TDLS_DEL_STA      1500
-
 /** Maximum time(ms) to wait for Link Establish Req to complete **/
 /** Maximum time(ms) to wait for Link Establish Req to complete **/
 #define WAIT_TIME_TDLS_LINK_ESTABLISH_REQ      1500
 #define WAIT_TIME_TDLS_LINK_ESTABLISH_REQ      1500
 
 

+ 3 - 0
core/wma/src/wma_dev_if.c

@@ -4950,6 +4950,9 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 			wma_remove_peer(wma, add_sta->staMac,
 			wma_remove_peer(wma, add_sta->staMac,
 					add_sta->smesessionId, peer, false);
 					add_sta->smesessionId, peer, false);
 			cdp_peer_add_last_real_peer(soc, pdev, vdev, &peer_id);
 			cdp_peer_add_last_real_peer(soc, pdev, vdev, &peer_id);
+			wma_remove_req(wma, add_sta->smesessionId,
+				       WMA_PEER_ASSOC_CNF_START);
+			peer_assoc_cnf = false;
 
 
 			goto send_rsp;
 			goto send_rsp;
 		}
 		}