iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wilc1000: wlan_initialize_threads: change argument with net_device

Browse Source 
This patch changes function argument with net_device and use netdev private
data member wilc instead of g_linux_wlan. And there are assignment code with
different value continuously. Take last code.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-10-27 18:27:45 +09:00 committed by Greg Kroah-Hartman
parent 472791a94f
commit 75a94665a1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/wilc1000/linux_wlan.c
View File

@ -1011,31 +1011,34 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, struct wilc *nic)
#endif
}
int wlan_initialize_threads(perInterface_wlan_t *nic)
int wlan_initialize_threads(struct net_device *dev)
{
perInterface_wlan_t *nic;
struct wilc *wilc;
int ret = 0;
nic = netdev_priv(dev);
wilc = nic->wilc;
PRINT_D(INIT_DBG, "Initializing Threads ...\n");
/* create tx task */
PRINT_D(INIT_DBG, "Creating kthread for transmission\n");
g_linux_wlan->txq_thread = kthread_run(linux_wlan_txq_task, (void *)g_linux_wlan, "K_TXQ_TASK");
if (g_linux_wlan->txq_thread == NULL) {
wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)wilc,
"K_TXQ_TASK");
if (!wilc->txq_thread) {
PRINT_ER("couldn't create TXQ thread\n");
ret = -ENOBUFS;
goto _fail_2;
}
/* wait for TXQ task to start. */
down(&g_linux_wlan->txq_thread_started);
down(&wilc->txq_thread_started);
return 0;
_fail_2:
/*De-Initialize 2nd thread*/
g_linux_wlan->close = 1;
g_linux_wlan->close = 0;
wilc->close = 0;
return ret;
}
@ -1084,7 +1087,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
}
#endif
ret = wlan_initialize_threads(nic);
ret = wlan_initialize_threads(dev);
if (ret < 0) {
PRINT_ER("Initializing Threads FAILED\n");
ret = -EIO;