1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index d235adb82c94..7e74b4fccddd 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -562,7 +562,8 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
 static int
 mwifiex_open(struct net_device *dev)
 {
-        netif_tx_start_all_queues(dev);
+        netif_carrier_off(dev);
+
         return 0;
 }
 
@@ -960,21 +961,21 @@ static const struct net_device_ops mwifiex_netdev_ops = {
  * In addition, the CFG80211 work queue is also created.
  */
 void mwifiex_init_priv_params(struct mwifiex_private *priv,
-                                                struct net_device *dev)
+                              struct net_device *dev)
 {
         dev->netdev_ops = &mwifiex_netdev_ops;
         dev->destructor = free_netdev;
         /* Initialize private structure */
         priv->current_key_index = 0;
         priv->media_connected = false;
-        memset(&priv->nick_name, 0, sizeof(priv->nick_name));
         memset(priv->mgmt_ie, 0,
                sizeof(struct mwifiex_ie) * MAX_MGMT_IE_INDEX);
         priv->beacon_idx = MWIFIEX_AUTO_IDX_MASK;
         priv->proberesp_idx = MWIFIEX_AUTO_IDX_MASK;
         priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK;
-        priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK;
+        priv->gen_idx = MWIFIEX_AUTO_IDX_MASK;
         priv->num_tx_timeout = 0;
+        ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr);
         memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
 
         if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||
@@ -1203,8 +1204,9 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
                         continue;
 
                 rtnl_lock();
-                if (priv->wdev && priv->netdev)
-                        mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev);
+                if (priv->netdev &&
+                    priv->wdev.iftype != NL80211_IFTYPE_UNSPECIFIED)
+                        mwifiex_del_virtual_intf(adapter->wiphy, &priv->wdev);
                 rtnl_unlock();
         }