1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 0ff4c37ab42a..9f44fda19db9 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -44,8 +44,6 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
 
         bss_prio->priv = priv;
         INIT_LIST_HEAD(&bss_prio->list);
-        if (!tbl[priv->bss_priority].bss_prio_cur)
-                tbl[priv->bss_priority].bss_prio_cur = bss_prio;
 
         spin_lock_irqsave(&tbl[priv->bss_priority].bss_prio_lock, flags);
         list_add_tail(&bss_prio->list, &tbl[priv->bss_priority].bss_prio_head);
@@ -318,9 +316,9 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
 
         adapter->is_hs_configured = false;
-        adapter->hs_cfg.conditions = cpu_to_le32(HOST_SLEEP_CFG_COND_DEF);
-        adapter->hs_cfg.gpio = HOST_SLEEP_CFG_GPIO_DEF;
-        adapter->hs_cfg.gap = HOST_SLEEP_CFG_GAP_DEF;
+        adapter->hs_cfg.conditions = cpu_to_le32(HS_CFG_COND_DEF);
+        adapter->hs_cfg.gpio = HS_CFG_GPIO_DEF;
+        adapter->hs_cfg.gap = HS_CFG_GAP_DEF;
         adapter->hs_activated = false;
 
         memset(adapter->event_body, 0, sizeof(adapter->event_body));
@@ -525,7 +523,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
 
         for (i = 0; i < adapter->priv_num; ++i) {
                 INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
-                adapter->bss_prio_tbl[i].bss_prio_cur = NULL;
                 spin_lock_init(&adapter->bss_prio_tbl[i].bss_prio_lock);
         }
 
@@ -533,10 +530,8 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
                 if (!adapter->priv[i])
                         continue;
                 priv = adapter->priv[i];
-                for (j = 0; j < MAX_NUM_TID; ++j) {
+                for (j = 0; j < MAX_NUM_TID; ++j)
                         INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[j].ra_list);
-                        spin_lock_init(&priv->wmm.tid_tbl_ptr[j].tid_tbl_lock);
-                }
                 INIT_LIST_HEAD(&priv->tx_ba_stream_tbl_ptr);
                 INIT_LIST_HEAD(&priv->rx_reorder_tbl_ptr);
                 INIT_LIST_HEAD(&priv->sta_list);
@@ -627,42 +622,36 @@ static void mwifiex_delete_bss_prio_tbl(struct mwifiex_private *priv)
 {
         int i;
         struct mwifiex_adapter *adapter = priv->adapter;
-        struct mwifiex_bss_prio_node *bssprio_node, *tmp_node, **cur;
+        struct mwifiex_bss_prio_node *bssprio_node, *tmp_node;
         struct list_head *head;
         spinlock_t *lock; /* bss priority lock */
         unsigned long flags;
 
         for (i = 0; i < adapter->priv_num; ++i) {
                 head = &adapter->bss_prio_tbl[i].bss_prio_head;
-                cur = &adapter->bss_prio_tbl[i].bss_prio_cur;
                 lock = &adapter->bss_prio_tbl[i].bss_prio_lock;
                 dev_dbg(adapter->dev, "info: delete BSS priority table,"
                                 " bss_type = %d, bss_num = %d, i = %d,"
-                                " head = %p, cur = %p\n",
-                              priv->bss_type, priv->bss_num, i, head, *cur);
-                if (*cur) {
+                                " head = %p\n",
+                              priv->bss_type, priv->bss_num, i, head);
+
+                {
                         spin_lock_irqsave(lock, flags);
                         if (list_empty(head)) {
                                 spin_unlock_irqrestore(lock, flags);
                                 continue;
                         }
-                        bssprio_node = list_first_entry(head,
-                                        struct mwifiex_bss_prio_node, list);
-                        spin_unlock_irqrestore(lock, flags);
-
                         list_for_each_entry_safe(bssprio_node, tmp_node, head,
                                                  list) {
                                 if (bssprio_node->priv == priv) {
                                         dev_dbg(adapter->dev, "info: Delete "
                                                 "node %p, next = %p\n",
                                                 bssprio_node, tmp_node);
-                                        spin_lock_irqsave(lock, flags);
                                         list_del(&bssprio_node->list);
-                                        spin_unlock_irqrestore(lock, flags);
                                         kfree(bssprio_node);
                                 }
                         }
-                        *cur = (struct mwifiex_bss_prio_node *)head;
+                        spin_unlock_irqrestore(lock, flags);
                 }
         }
 }
@@ -713,7 +702,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
         if (adapter->curr_cmd) {
                 dev_warn(adapter->dev, "curr_cmd is still in processing\n");
                 del_timer(&adapter->cmd_timer);
-                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);
                 adapter->curr_cmd = NULL;
         }