mwifiex: fix simultaneous assoc and scan issue

[deliverable/linux.git] / drivers / net / wireless / mwifiex / init.c

diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 43ea87d0f34823cb73c66f9bc02f075a79891565..fc2c0c5728d975f30087e7c3c9b26eb4f6d247e9 100644 (file)
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -35,7 +35,6 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
 {
        struct mwifiex_adapter *adapter = priv->adapter;
        struct mwifiex_bss_prio_node *bss_prio;
-       int status = 0;
        unsigned long flags;
 
        bss_prio = kzalloc(sizeof(struct mwifiex_bss_prio_node), GFP_KERNEL);
@@ -59,7 +58,7 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
        spin_unlock_irqrestore(&adapter->bss_prio_tbl[priv->bss_priority]
                        .bss_prio_lock, flags);
 
-       return status;
+       return 0;
 }
 
 /*
@@ -72,7 +71,6 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
 static int mwifiex_init_priv(struct mwifiex_private *priv)
 {
        u32 i;
-       int ret = 0;
 
        priv->media_connected = false;
        memset(priv->curr_addr, 0xff, ETH_ALEN);
@@ -86,7 +84,7 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
 
        priv->sec_info.wep_status = MWIFIEX_802_11_WEP_DISABLED;
        priv->sec_info.authentication_mode = NL80211_AUTHTYPE_OPEN_SYSTEM;
-       priv->sec_info.encryption_mode = MWIFIEX_ENCRYPTION_MODE_NONE;
+       priv->sec_info.encryption_mode = 0;
        for (i = 0; i < ARRAY_SIZE(priv->wep_key); i++)
                memset(&priv->wep_key[i], 0, sizeof(struct mwifiex_wep_key));
        priv->wep_key_curr_index = 0;
@@ -140,9 +138,7 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
 
        priv->scan_block = false;
 
-       ret = mwifiex_add_bss_prio_tbl(priv);
-
-       return ret;
+       return mwifiex_add_bss_prio_tbl(priv);
 }
 
 /*
@@ -300,8 +296,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
        adapter->adhoc_awake_period = 0;
        memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
        adapter->arp_filter_size = 0;
-
-       return;
 }
 
 /*
@@ -340,8 +334,6 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
        adapter->if_ops.cleanup_if(adapter);
 
        dev_kfree_skb_any(adapter->sleep_cfm);
-
-       return;
 }
 
 /*
@@ -429,8 +421,6 @@ void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
                        list_del(&priv->rx_reorder_tbl_ptr);
                }
        }
-
-       return;
 }
 
 /*