summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorService qcabuildsw <qcabuildsw@localhost>2016-12-27 12:00:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-27 12:00:35 -0800
commit15c4e04521857b16d040eae11adc1e388cc8c728 (patch)
tree58854afa552a4e716ccf556116ad859a61a4e25d
parentc134c66ce677787faa79447ba662a050ebc437bd (diff)
parentd167e9b4857ad4aa604ecb6773c9edeb727572c0 (diff)
Merge "qcacld-3.0: reduce spinlock time in htt_rx_hash_init" into wlan-cld3.driver.lnx.1.1-dev
-rw-r--r--core/dp/htt/htt_rx.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c
index 7b4ffa665988..617becb5e1db 100644
--- a/core/dp/htt/htt_rx.c
+++ b/core/dp/htt/htt_rx.c
@@ -3009,6 +3009,7 @@ static int htt_rx_hash_init(struct htt_pdev_t *pdev)
{
int i, j;
int rc = 0;
+ void *allocation;
HTT_ASSERT2(QDF_IS_PWR2(RX_NUM_HASH_BUCKETS));
@@ -3027,10 +3028,13 @@ static int htt_rx_hash_init(struct htt_pdev_t *pdev)
for (i = 0; i < RX_NUM_HASH_BUCKETS; i++) {
+ qdf_spin_unlock_bh(&(pdev->rx_ring.rx_hash_lock));
/* pre-allocate bucket and pool of entries for this bucket */
- pdev->rx_ring.hash_table[i] = qdf_mem_malloc(
- (sizeof(struct htt_rx_hash_bucket) +
+ allocation = qdf_mem_malloc((sizeof(struct htt_rx_hash_bucket) +
(RX_ENTRIES_SIZE * sizeof(struct htt_rx_hash_entry))));
+ qdf_spin_lock_bh(&(pdev->rx_ring.rx_hash_lock));
+ pdev->rx_ring.hash_table[i] = allocation;
+
HTT_RX_HASH_COUNT_RESET(pdev->rx_ring.hash_table[i]);