From 24389de0b9a0d91a49c9c249a62ff2e020d520da Mon Sep 17 00:00:00 2001 From: Kabilan Kannan Date: Wed, 10 Aug 2016 18:15:59 -0700 Subject: [PATCH] qcacld-3.0: Fix the apps crash caused by tdls spinlock calls Apps crash observed due to nested spin lock calls from the soft irq context. Change the tdls spin lock calls from qdf_spin_lock() to qdf_spin_lock_bh(). This will avoid nested spin lock calls. Change-Id: I9c3d32f2385bec35ea7d9773ed4c36968a79a28b CRs-Fixed: 1053041 --- core/hdd/src/wlan_hdd_tdls.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index e5994068a0c7..6ba82a47259b 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -5118,10 +5118,10 @@ static void wlan_hdd_tdls_ct_sampling_tx_rx(hdd_adapter_t *adapter, uint8_t valid_mac_entries; struct tdls_ct_mac_table ct_peer_mac_table[TDLS_CT_MAC_MAX_TABLE_SIZE]; - qdf_spin_lock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_lock_bh(&hdd_ctx->tdls_ct_spinlock); if (0 == tdls_ctx->valid_mac_entries) { - qdf_spin_unlock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_unlock_bh(&hdd_ctx->tdls_ct_spinlock); return; } @@ -5135,7 +5135,7 @@ static void wlan_hdd_tdls_ct_sampling_tx_rx(hdd_adapter_t *adapter, tdls_ctx->valid_mac_entries = 0; - qdf_spin_unlock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_unlock_bh(&hdd_ctx->tdls_ct_spinlock); for (mac_cnt = 0; mac_cnt < valid_mac_entries; mac_cnt++) { memcpy(mac, ct_peer_mac_table[mac_cnt].mac_address.bytes, @@ -5187,7 +5187,7 @@ void wlan_hdd_tdls_update_rx_pkt_cnt(hdd_adapter_t *adapter, hdd_ctx = WLAN_HDD_GET_CTX(adapter); tdls_ctx = adapter->sessionCtx.station.pHddTdlsCtx; - qdf_spin_lock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_lock_bh(&hdd_ctx->tdls_ct_spinlock); valid_mac_entries = tdls_ctx->valid_mac_entries; for (mac_cnt = 0; mac_cnt < valid_mac_entries; mac_cnt++) { @@ -5209,7 +5209,7 @@ void wlan_hdd_tdls_update_rx_pkt_cnt(hdd_adapter_t *adapter, } rx_cnt_return: - qdf_spin_unlock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_unlock_bh(&hdd_ctx->tdls_ct_spinlock); return; } @@ -5250,7 +5250,7 @@ void wlan_hdd_tdls_update_tx_pkt_cnt(hdd_adapter_t *adapter, hdd_ctx = WLAN_HDD_GET_CTX(adapter); tdls_ctx = adapter->sessionCtx.station.pHddTdlsCtx; - qdf_spin_lock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_lock_bh(&hdd_ctx->tdls_ct_spinlock); valid_mac_entries = tdls_ctx->valid_mac_entries; for (mac_cnt = 0; mac_cnt < valid_mac_entries; mac_cnt++) { @@ -5272,7 +5272,7 @@ void wlan_hdd_tdls_update_tx_pkt_cnt(hdd_adapter_t *adapter, } tx_cnt_return: - qdf_spin_unlock(&hdd_ctx->tdls_ct_spinlock); + qdf_spin_unlock_bh(&hdd_ctx->tdls_ct_spinlock); return; }