staging: wilc1000: linux_wlan_txq_task: use wilc instead of g_linux_wlan

Pass argument dev instead of wilc from kthread_run and use netdev private data
member wilc instead of g_linux_wlan.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 4e88cbe2f797ec87c65c5d8b3773774268a8825f..5897f353430c397216d89c511a33e3c3cd4add81 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -440,7 +440,9 @@ int linux_wlan_get_num_conn_ifcs(void)
 static int linux_wlan_txq_task(void *vp)
 {
        int ret, txq_count;
-
+       perInterface_wlan_t *nic;
+       struct wilc *wl;
+       struct net_device *dev = vp;
 #if defined USE_TX_BACKOFF_DELAY_IF_NO_BUFFERS
 #define TX_BACKOFF_WEIGHT_INCR_STEP (1)
 #define TX_BACKOFF_WEIGHT_DECR_STEP (1)
@@ -450,18 +452,21 @@ static int linux_wlan_txq_task(void *vp)
        int backoff_weight = TX_BACKOFF_WEIGHT_MIN;
 #endif
 
+       nic = netdev_priv(dev);
+       wl = nic->wilc;
+
        /* inform wilc1000_wlan_init that TXQ task is started. */
-       up(&g_linux_wlan->txq_thread_started);
+       up(&wl->txq_thread_started);
        while (1) {
 
                PRINT_D(TX_DBG, "txq_task Taking a nap :)\n");
-               down(&g_linux_wlan->txq_event);
+               down(&wl->txq_event);
                /* wait_for_completion(&pd->txq_event); */
                PRINT_D(TX_DBG, "txq_task Who waked me up :$\n");
 
-               if (g_linux_wlan->close) {
+               if (wl->close) {
                        /*Unlock the mutex in the mac_close function to indicate the exiting of the TX thread */
-                       up(&g_linux_wlan->txq_thread_started);
+                       up(&wl->txq_thread_started);
 
                        while (!kthread_should_stop())
                                schedule();
@@ -478,10 +483,10 @@ static int linux_wlan_txq_task(void *vp)
                        if (txq_count < FLOW_CONTROL_LOWER_THRESHOLD /* && netif_queue_stopped(pd->wilc_netdev)*/) {
                                PRINT_D(TX_DBG, "Waking up queue\n");
                                /* netif_wake_queue(pd->wilc_netdev); */
-                               if (netif_queue_stopped(g_linux_wlan->vif[0].ndev))
-                                       netif_wake_queue(g_linux_wlan->vif[0].ndev);
-                               if (netif_queue_stopped(g_linux_wlan->vif[1].ndev))
-                                       netif_wake_queue(g_linux_wlan->vif[1].ndev);
+                               if (netif_queue_stopped(wl->vif[0].ndev))
+                                       netif_wake_queue(wl->vif[0].ndev);
+                               if (netif_queue_stopped(wl->vif[1].ndev))
+                                       netif_wake_queue(wl->vif[1].ndev);
                        }
 
                        if (ret == WILC_TX_ERR_NO_BUF) { /* failed to allocate buffers in chip. */
@@ -503,7 +508,7 @@ static int linux_wlan_txq_task(void *vp)
                                }
                        }
                        /*TODO: drop packets after a certain time/number of retry count. */
-               } while (ret == WILC_TX_ERR_NO_BUF && !g_linux_wlan->close); /* retry sending packets if no more buffers in chip. */
+               } while (ret == WILC_TX_ERR_NO_BUF && !wl->close); /* retry sending packets if no more buffers in chip. */
 #endif
        }
        return 0;
@@ -1024,7 +1029,7 @@ int wlan_initialize_threads(struct net_device *dev)
 
        /* create tx task */
        PRINT_D(INIT_DBG, "Creating kthread for transmission\n");
-       wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)wilc,
+       wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)dev,
                                     "K_TXQ_TASK");
        if (!wilc->txq_thread) {
                PRINT_ER("couldn't create TXQ thread\n");