mwifiex: rearrange AP sys configure code

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

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 245b7329e0c9254bbbeaba04ba63feb888aeb56e..43e4efad4cf7ca64b54a8f5b6c07396d1bfd6996 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -58,22 +58,23 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops,
        memmove(&adapter->if_ops, if_ops, sizeof(struct mwifiex_if_ops));
 
        /* card specific initialization has been deferred until now .. */
-       if (adapter->if_ops.init_if(adapter))
-               goto error;
+       if (adapter->if_ops.init_if)
+               if (adapter->if_ops.init_if(adapter))
+                       goto error;
 
        adapter->priv_num = 0;
 
-       /* Allocate memory for private structure */
-       adapter->priv[0] = kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);
-       if (!adapter->priv[0]) {
-               dev_err(adapter->dev,
-                       "%s: failed to alloc priv[0]\n", __func__);
-               goto error;
-       }
+       for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {
+               /* Allocate memory for private structure */
+               adapter->priv[i] =
+                       kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);
+               if (!adapter->priv[i])
+                       goto error;
 
-       adapter->priv_num++;
-
-       adapter->priv[0]->adapter = adapter;
+               adapter->priv[i]->adapter = adapter;
+               adapter->priv[i]->bss_priority = i;
+               adapter->priv_num++;
+       }
        mwifiex_init_lock_list(adapter);
 
        init_timer(&adapter->cmd_timer);
@@ -140,6 +141,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
 {
        int ret = 0;
        unsigned long flags;
+       struct sk_buff *skb;
 
        spin_lock_irqsave(&adapter->main_proc_lock, flags);
 
@@ -161,7 +163,8 @@ process_start:
                if (adapter->int_status) {
                        if (adapter->hs_activated)
                                mwifiex_process_hs_config(adapter);
-                       adapter->if_ops.process_int_status(adapter);
+                       if (adapter->if_ops.process_int_status)
+                               adapter->if_ops.process_int_status(adapter);
                }
 
                /* Need to wake up the card ? */
@@ -174,6 +177,7 @@ process_start:
                        adapter->if_ops.wakeup(adapter);
                        continue;
                }
+
                if (IS_CARD_RX_RCVD(adapter)) {
                        adapter->pm_wakeup_fw_try = false;
                        if (adapter->ps_state == PS_STATE_SLEEP)
@@ -194,6 +198,11 @@ process_start:
                        }
                }
 
+               /* Check Rx data for USB */
+               if (adapter->iface_type == MWIFIEX_USB)
+                       while ((skb = skb_dequeue(&adapter->usb_rx_data_q)))
+                               mwifiex_handle_rx_packet(adapter, skb);
+
                /* Check for Cmd Resp */
                if (adapter->cmd_resp_received) {
                        adapter->cmd_resp_received = false;
@@ -317,7 +326,10 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
        fw.fw_buf = (u8 *) adapter->firmware->data;
        fw.fw_len = adapter->firmware->size;
 
-       ret = mwifiex_dnld_fw(adapter, &fw);
+       if (adapter->if_ops.dnld_fw)
+               ret = adapter->if_ops.dnld_fw(adapter, &fw);
+       else
+               ret = mwifiex_dnld_fw(adapter, &fw);
        if (ret == -1)
                goto done;
 
@@ -337,19 +349,26 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
        if (adapter->hw_status != MWIFIEX_HW_STATUS_READY)
                goto done;
 
-       priv = adapter->priv[0];
-       if (mwifiex_register_cfg80211(priv) != 0) {
+       priv = adapter->priv[MWIFIEX_BSS_ROLE_STA];
+       if (mwifiex_register_cfg80211(adapter)) {
                dev_err(adapter->dev, "cannot register with cfg80211\n");
                goto err_init_fw;
        }
 
        rtnl_lock();
        /* Create station interface by default */
-       if (!mwifiex_add_virtual_intf(priv->wdev->wiphy, "mlan%d",
+       if (!mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d",
                                      NL80211_IFTYPE_STATION, NULL, NULL)) {
                dev_err(adapter->dev, "cannot create default STA interface\n");
                goto err_add_intf;
        }
+
+       /* Create AP interface by default */
+       if (!mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
+                                     NL80211_IFTYPE_AP, NULL, NULL)) {
+               dev_err(adapter->dev, "cannot create default AP interface\n");
+               goto err_add_intf;
+       }
        rtnl_unlock();
 
        mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
@@ -357,7 +376,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
        goto done;
 
 err_add_intf:
-       mwifiex_del_virtual_intf(priv->wdev->wiphy, priv->netdev);
+       mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
        rtnl_unlock();
 err_init_fw:
        pr_debug("info: %s: unregister device\n", __func__);
@@ -731,7 +750,8 @@ mwifiex_add_card(void *card, struct semaphore *sem,
 
 err_init_fw:
        pr_debug("info: %s: unregister device\n", __func__);
-       adapter->if_ops.unregister_dev(adapter);
+       if (adapter->if_ops.unregister_dev)
+               adapter->if_ops.unregister_dev(adapter);
 err_registerdev:
        adapter->surprise_removed = true;
        mwifiex_terminate_workqueue(adapter);
@@ -817,26 +837,29 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
 
                rtnl_lock();
                if (priv->wdev && priv->netdev)
-                       mwifiex_del_virtual_intf(priv->wdev->wiphy,
-                                                priv->netdev);
+                       mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
                rtnl_unlock();
        }
 
        priv = adapter->priv[0];
-       if (!priv)
+       if (!priv || !priv->wdev)
                goto exit_remove;
 
-       if (priv->wdev) {
-               wiphy_unregister(priv->wdev->wiphy);
-               wiphy_free(priv->wdev->wiphy);
-               kfree(priv->wdev);
+       wiphy_unregister(priv->wdev->wiphy);
+       wiphy_free(priv->wdev->wiphy);
+
+       for (i = 0; i < adapter->priv_num; i++) {
+               priv = adapter->priv[i];
+               if (priv)
+                       kfree(priv->wdev);
        }
 
        mwifiex_terminate_workqueue(adapter);
 
        /* Unregister device */
        dev_dbg(adapter->dev, "info: unregister device\n");
-       adapter->if_ops.unregister_dev(adapter);
+       if (adapter->if_ops.unregister_dev)
+               adapter->if_ops.unregister_dev(adapter);
        /* Free adapter structure */
        dev_dbg(adapter->dev, "info: free adapter\n");
        mwifiex_free_adapter(adapter);