Skip to content

L
linux
Commit 4423f3b0 authored by Kim, Leo's avatar Kim, Leo Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: remove warnings on the multiple blank lines uses 

This patch removes the warnings reported by checkpatch.pl for using
multiple blank lines.
Signed-off-by: default avatarKim, Leo <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc4b95d6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 69 deletions
drivers/staging/wilc1000/linux_wlan.c
View file @ 4423f3b0
...@@ -102,7 +102,6 @@ static int linux_wlan_device_detection(int on_off) ...@@ -102,7 +102,6 @@ static int linux_wlan_device_detection(int on_off)
return 0; return 0;
} }
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr); static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr);
...@@ -115,7 +114,6 @@ static struct notifier_block g_dev_notifier = { ...@@ -115,7 +114,6 @@ static struct notifier_block g_dev_notifier = {
if (g_linux_wlan->oup.wlan_cleanup != NULL) \ if (g_linux_wlan->oup.wlan_cleanup != NULL) \
g_linux_wlan->oup.wlan_cleanup(); } g_linux_wlan->oup.wlan_cleanup(); }
#ifndef STA_FIRMWARE #ifndef STA_FIRMWARE
#define STA_FIRMWARE "wifi_firmware.bin" #define STA_FIRMWARE "wifi_firmware.bin"
#endif #endif
...@@ -128,15 +126,12 @@ static struct notifier_block g_dev_notifier = { ...@@ -128,15 +126,12 @@ static struct notifier_block g_dev_notifier = {
#define P2P_CONCURRENCY_FIRMWARE "wifi_firmware_p2p_concurrency.bin" #define P2P_CONCURRENCY_FIRMWARE "wifi_firmware_p2p_concurrency.bin"
#endif #endif
typedef struct android_wifi_priv_cmd { typedef struct android_wifi_priv_cmd {
char *buf; char *buf;
int used_len; int used_len;
int total_len; int total_len;
} android_wifi_priv_cmd; } android_wifi_priv_cmd;
#define IRQ_WAIT 1 #define IRQ_WAIT 1
#define IRQ_NO_WAIT 0 #define IRQ_NO_WAIT 0
/* /*
...@@ -157,7 +152,6 @@ void linux_wlan_unlock(void *vp); ...@@ -157,7 +152,6 @@ void linux_wlan_unlock(void *vp);
extern void WILC_WFI_monitor_rx(uint8_t *buff, uint32_t size); extern void WILC_WFI_monitor_rx(uint8_t *buff, uint32_t size);
extern void WILC_WFI_p2p_rx(struct net_device *dev, uint8_t *buff, uint32_t size); extern void WILC_WFI_p2p_rx(struct net_device *dev, uint8_t *buff, uint32_t size);
static void *internal_alloc(uint32_t size, uint32_t flag); static void *internal_alloc(uint32_t size, uint32_t flag);
static void linux_wlan_tx_complete(void *priv, int status); static void linux_wlan_tx_complete(void *priv, int status);
void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset); void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset);
...@@ -169,8 +163,6 @@ static struct net_device_stats *mac_stats(struct net_device *dev); ...@@ -169,8 +163,6 @@ static struct net_device_stats *mac_stats(struct net_device *dev);
static int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd); static int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd);
static void wilc_set_multicast_list(struct net_device *dev); static void wilc_set_multicast_list(struct net_device *dev);
/* /*
* for now - in frmw_to_linux there should be private data to be passed to it * for now - in frmw_to_linux there should be private data to be passed to it
* and this data should be pointer to net device * and this data should be pointer to net device
...@@ -199,8 +191,6 @@ volatile int WatchDogdebuggerCounter; ...@@ -199,8 +191,6 @@ volatile int WatchDogdebuggerCounter;
char DebugBuffer[DEGUG_BUFFER_LENGTH + 20] = {0}; char DebugBuffer[DEGUG_BUFFER_LENGTH + 20] = {0};
static char *ps8current = DebugBuffer; static char *ps8current = DebugBuffer;
void printk_later(const char *format, ...) void printk_later(const char *format, ...)
{ {
va_list args; va_list args;
...@@ -212,7 +202,6 @@ void printk_later(const char *format, ...) ...@@ -212,7 +202,6 @@ void printk_later(const char *format, ...)
} }
void dump_logs() void dump_logs()
{ {
if (DebugBuffer[0]) { if (DebugBuffer[0]) {
...@@ -244,11 +233,8 @@ static int DebuggingThreadTask(void *vp) ...@@ -244,11 +233,8 @@ static int DebuggingThreadTask(void *vp)
WatchDogdebuggerCounter = 0; WatchDogdebuggerCounter = 0;
} }
} }
#endif #endif
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr) static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr)
{ {
...@@ -296,7 +282,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -296,7 +282,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
PRINT_INFO(GENERIC_DBG, "\n ============== IP Address Obtained ===============\n\n"); PRINT_INFO(GENERIC_DBG, "\n ============== IP Address Obtained ===============\n\n");
/*If we are in station mode or client mode*/ /*If we are in station mode or client mode*/
if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) { if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) {
pstrWFIDrv->IFC_UP = 1; pstrWFIDrv->IFC_UP = 1;
...@@ -305,8 +290,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -305,8 +290,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n"); PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n");
} }
if (bEnablePS) if (bEnablePS)
host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 1, 0); host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 1, 0);
...@@ -332,7 +315,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -332,7 +315,6 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
resolve_disconnect_aberration(pstrWFIDrv); resolve_disconnect_aberration(pstrWFIDrv);
PRINT_D(GENERIC_DBG, "[%s] Down IP\n", dev_iface->ifa_label); PRINT_D(GENERIC_DBG, "[%s] Down IP\n", dev_iface->ifa_label);
pIP_Add_buff = null_ip; pIP_Add_buff = null_ip;
...@@ -385,8 +367,6 @@ void linux_wlan_disable_irq(int wait) ...@@ -385,8 +367,6 @@ void linux_wlan_disable_irq(int wait)
#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
static irqreturn_t isr_uh_routine(int irq, void *user_data) static irqreturn_t isr_uh_routine(int irq, void *user_data)
{ {
int_rcvdU++; int_rcvdU++;
#if (RX_BH_TYPE != RX_BH_THREADED_IRQ) #if (RX_BH_TYPE != RX_BH_THREADED_IRQ)
linux_wlan_disable_irq(IRQ_NO_WAIT); linux_wlan_disable_irq(IRQ_NO_WAIT);
...@@ -438,9 +418,6 @@ static void isr_bh_routine(struct work_struct *work) ...@@ -438,9 +418,6 @@ static void isr_bh_routine(struct work_struct *work)
#else #else
return; return;
#endif #endif
} }
int_rcvdB++; int_rcvdB++;
...@@ -451,7 +428,6 @@ static void isr_bh_routine(struct work_struct *work) ...@@ -451,7 +428,6 @@ static void isr_bh_routine(struct work_struct *work)
PRINT_ER("wlan_handle_rx_isr() hasn't been initialized\n"); PRINT_ER("wlan_handle_rx_isr() hasn't been initialized\n");
} }
#if (RX_BH_TYPE == RX_BH_THREADED_IRQ) #if (RX_BH_TYPE == RX_BH_THREADED_IRQ)
return IRQ_HANDLED; return IRQ_HANDLED;
#endif #endif
...@@ -485,7 +461,6 @@ static int isr_bh_routine(void *vp) ...@@ -485,7 +461,6 @@ static int isr_bh_routine(void *vp)
} }
#endif #endif
#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
static int init_irq(linux_wlan_t *p_nic) static int init_irq(linux_wlan_t *p_nic)
{ {
...@@ -516,7 +491,6 @@ static int init_irq(linux_wlan_t *p_nic) ...@@ -516,7 +491,6 @@ static int init_irq(linux_wlan_t *p_nic)
PRINT_ER("could not obtain gpio for WILC_INTR\n"); PRINT_ER("could not obtain gpio for WILC_INTR\n");
} }
#if (RX_BH_TYPE == RX_BH_THREADED_IRQ) #if (RX_BH_TYPE == RX_BH_THREADED_IRQ)
if ((ret != -1) && (request_threaded_irq(nic->dev_irq_num, isr_uh_routine, isr_bh_routine, if ((ret != -1) && (request_threaded_irq(nic->dev_irq_num, isr_uh_routine, isr_bh_routine,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, /*Without IRQF_ONESHOT the uh will remain kicked in and dont gave a chance to bh*/ IRQF_TRIGGER_LOW | IRQF_ONESHOT, /*Without IRQF_ONESHOT the uh will remain kicked in and dont gave a chance to bh*/
...@@ -552,7 +526,6 @@ static void deinit_irq(linux_wlan_t *nic) ...@@ -552,7 +526,6 @@ static void deinit_irq(linux_wlan_t *nic)
#endif #endif
} }
/* /*
* OS functions * OS functions
*/ */
...@@ -599,7 +572,6 @@ void linux_wlan_free(void *vp) ...@@ -599,7 +572,6 @@ void linux_wlan_free(void *vp)
} }
} }
static void *internal_alloc(uint32_t size, uint32_t flag) static void *internal_alloc(uint32_t size, uint32_t flag)
{ {
char *pntr = NULL; char *pntr = NULL;
...@@ -608,7 +580,6 @@ static void *internal_alloc(uint32_t size, uint32_t flag) ...@@ -608,7 +580,6 @@ static void *internal_alloc(uint32_t size, uint32_t flag)
return (void *)pntr; return (void *)pntr;
} }
static void linux_wlan_init_lock(char *lockName, void *plock, int count) static void linux_wlan_init_lock(char *lockName, void *plock, int count)
{ {
sema_init((struct semaphore *)plock, count); sema_init((struct semaphore *)plock, count);
...@@ -654,7 +625,6 @@ void linux_wlan_unlock(void *vp) ...@@ -654,7 +625,6 @@ void linux_wlan_unlock(void *vp)
} }
} }
static void linux_wlan_init_mutex(char *lockName, void *plock, int count) static void linux_wlan_init_mutex(char *lockName, void *plock, int count)
{ {
mutex_init((struct mutex *)plock); mutex_init((struct mutex *)plock);
...@@ -700,7 +670,6 @@ static void linux_wlan_unlock_mutex(void *vp) ...@@ -700,7 +670,6 @@ static void linux_wlan_unlock_mutex(void *vp)
} }
} }
/*Added by Amr - BugID_4720*/ /*Added by Amr - BugID_4720*/
static void linux_wlan_init_spin_lock(char *lockName, void *plock, int count) static void linux_wlan_init_spin_lock(char *lockName, void *plock, int count)
{ {
...@@ -938,7 +907,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) ...@@ -938,7 +907,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
const struct firmware *wilc_firmware; const struct firmware *wilc_firmware;
char *firmware; char *firmware;
if (nic->iftype == AP_MODE) if (nic->iftype == AP_MODE)
firmware = AP_FIRMWARE; firmware = AP_FIRMWARE;
else if (nic->iftype == STATION_MODE) else if (nic->iftype == STATION_MODE)
...@@ -950,8 +918,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) ...@@ -950,8 +918,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
firmware = P2P_CONCURRENCY_FIRMWARE; firmware = P2P_CONCURRENCY_FIRMWARE;
} }
if (nic == NULL) { if (nic == NULL) {
PRINT_ER("NIC is NULL\n"); PRINT_ER("NIC is NULL\n");
goto _fail_; goto _fail_;
...@@ -962,7 +928,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) ...@@ -962,7 +928,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
goto _fail_; goto _fail_;
} }
/* the firmare should be located in /lib/firmware in /* the firmare should be located in /lib/firmware in
* root file system with the name specified above */ * root file system with the name specified above */
...@@ -1061,7 +1026,6 @@ static int linux_wlan_firmware_download(linux_wlan_t *p_nic) ...@@ -1061,7 +1026,6 @@ static int linux_wlan_firmware_download(linux_wlan_t *p_nic)
return ret; return ret;
} }
/* startup configuration - could be changed later using iconfig*/ /* startup configuration - could be changed later using iconfig*/
static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_nic) static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_nic)
{ {
...@@ -1087,7 +1051,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -1087,7 +1051,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]); PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]);
wilc_get_chipid(0); wilc_get_chipid(0);
if (g_linux_wlan->oup.wlan_cfg_set == NULL) { if (g_linux_wlan->oup.wlan_cfg_set == NULL) {
PRINT_D(INIT_DBG, "Null p[ointer\n"); PRINT_D(INIT_DBG, "Null p[ointer\n");
goto _fail_; goto _fail_;
...@@ -1107,7 +1070,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -1107,7 +1070,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_BSS_TYPE, c_val, 1, 0, 0)) if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_BSS_TYPE, c_val, 1, 0, 0))
goto _fail_; goto _fail_;
/* c_val[0] = RATE_AUTO; / * bug 4275: Enable autorate and limit it to 24Mbps * / */ /* c_val[0] = RATE_AUTO; / * bug 4275: Enable autorate and limit it to 24Mbps * / */
c_val[0] = RATE_AUTO; c_val[0] = RATE_AUTO;
if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_CURRENT_TX_RATE, c_val, 1, 0, 0)) if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_CURRENT_TX_RATE, c_val, 1, 0, 0))
...@@ -1342,7 +1304,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -1342,7 +1304,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
return -1; return -1;
} }
/**************************/ /**************************/
void wilc1000_wlan_deinit(linux_wlan_t *nic) void wilc1000_wlan_deinit(linux_wlan_t *nic)
{ {
...@@ -1376,7 +1337,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic) ...@@ -1376,7 +1337,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic)
#endif #endif
#endif #endif
/* not sure if the following unlocks are needed or not*/ /* not sure if the following unlocks are needed or not*/
if (&g_linux_wlan->rxq_event != NULL) if (&g_linux_wlan->rxq_event != NULL)
linux_wlan_unlock(&g_linux_wlan->rxq_event); linux_wlan_unlock(&g_linux_wlan->rxq_event);
...@@ -1384,7 +1344,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic) ...@@ -1384,7 +1344,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic)
if (&g_linux_wlan->txq_event != NULL) if (&g_linux_wlan->txq_event != NULL)
linux_wlan_unlock(&g_linux_wlan->txq_event); linux_wlan_unlock(&g_linux_wlan->txq_event);
#if (RX_BH_TYPE == RX_BH_WORK_QUEUE) #if (RX_BH_TYPE == RX_BH_WORK_QUEUE)
/*Removing the work struct from the linux kernel workqueue*/ /*Removing the work struct from the linux kernel workqueue*/
if (&g_linux_wlan->rx_work_queue != NULL) if (&g_linux_wlan->rx_work_queue != NULL)
...@@ -1401,7 +1360,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic) ...@@ -1401,7 +1360,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic)
PRINT_D(INIT_DBG, "Deinitializing IRQ\n"); PRINT_D(INIT_DBG, "Deinitializing IRQ\n");
deinit_irq(g_linux_wlan); deinit_irq(g_linux_wlan);
if (&g_linux_wlan->oup != NULL) { if (&g_linux_wlan->oup != NULL) {
if (g_linux_wlan->oup.wlan_stop != NULL) if (g_linux_wlan->oup.wlan_stop != NULL)
g_linux_wlan->oup.wlan_stop(); g_linux_wlan->oup.wlan_stop();
...@@ -1662,17 +1620,14 @@ static void wlan_deinitialize_threads(linux_wlan_t *nic) ...@@ -1662,17 +1620,14 @@ static void wlan_deinitialize_threads(linux_wlan_t *nic)
if (&g_linux_wlan->rxq_event != NULL) if (&g_linux_wlan->rxq_event != NULL)
linux_wlan_unlock(&g_linux_wlan->rxq_event); linux_wlan_unlock(&g_linux_wlan->rxq_event);
if (g_linux_wlan->rxq_thread != NULL) { if (g_linux_wlan->rxq_thread != NULL) {
kthread_stop(g_linux_wlan->rxq_thread); kthread_stop(g_linux_wlan->rxq_thread);
g_linux_wlan->rxq_thread = NULL; g_linux_wlan->rxq_thread = NULL;
} }
if (&g_linux_wlan->txq_event != NULL) if (&g_linux_wlan->txq_event != NULL)
linux_wlan_unlock(&g_linux_wlan->txq_event); linux_wlan_unlock(&g_linux_wlan->txq_event);
if (g_linux_wlan->txq_thread != NULL) { if (g_linux_wlan->txq_thread != NULL) {
kthread_stop(g_linux_wlan->txq_thread); kthread_stop(g_linux_wlan->txq_thread);
g_linux_wlan->txq_thread = NULL; g_linux_wlan->txq_thread = NULL;
...@@ -1872,7 +1827,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1872,7 +1827,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
/*Save the oup structre into global pointer*/ /*Save the oup structre into global pointer*/
gpstrWlanOps = &g_linux_wlan->oup; gpstrWlanOps = &g_linux_wlan->oup;
ret = wlan_initialize_threads(nic); ret = wlan_initialize_threads(nic);
if (ret < 0) { if (ret < 0) {
PRINT_ER("Initializing Threads FAILED\n"); PRINT_ER("Initializing Threads FAILED\n");
...@@ -1910,7 +1864,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1910,7 +1864,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
goto _fail_irq_enable_; goto _fail_irq_enable_;
} }
/*Download firmware*/ /*Download firmware*/
ret = linux_wlan_firmware_download(g_linux_wlan); ret = linux_wlan_firmware_download(g_linux_wlan);
if (ret < 0) { if (ret < 0) {
...@@ -1950,7 +1903,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1950,7 +1903,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
g_linux_wlan->wilc1000_initialized = 1; g_linux_wlan->wilc1000_initialized = 1;
return 0; /*success*/ return 0; /*success*/
_fail_fw_start_: _fail_fw_start_:
if (&g_linux_wlan->oup != NULL) { if (&g_linux_wlan->oup != NULL) {
if (g_linux_wlan->oup.wlan_stop != NULL) if (g_linux_wlan->oup.wlan_stop != NULL)
...@@ -1979,7 +1931,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1979,7 +1931,6 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
return ret; return ret;
} }
/* /*
* - this function will be called automatically by OS when module inserted. * - this function will be called automatically by OS when module inserted.
*/ */
...@@ -2011,7 +1962,6 @@ int mac_init_fn(struct net_device *ndev) ...@@ -2011,7 +1962,6 @@ int mac_init_fn(struct net_device *ndev)
} }
#endif #endif
void WILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev, void WILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev,
u16 frame_type, bool reg); u16 frame_type, bool reg);
...@@ -2075,7 +2025,6 @@ int mac_open(struct net_device *ndev) ...@@ -2075,7 +2025,6 @@ int mac_open(struct net_device *ndev)
goto _err_; goto _err_;
} }
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev, WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
nic->g_struct_frame_reg[0].frame_type, nic->g_struct_frame_reg[0].reg); nic->g_struct_frame_reg[0].frame_type, nic->g_struct_frame_reg[0].reg);
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev, WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
...@@ -2114,7 +2063,6 @@ struct net_device_stats *mac_stats(struct net_device *dev) ...@@ -2114,7 +2063,6 @@ struct net_device_stats *mac_stats(struct net_device *dev)
{ {
perInterface_wlan_t *nic = netdev_priv(dev); perInterface_wlan_t *nic = netdev_priv(dev);
return &nic->netstats; return &nic->netstats;
} }
...@@ -2129,7 +2077,6 @@ static void wilc_set_multicast_list(struct net_device *dev) ...@@ -2129,7 +2077,6 @@ static void wilc_set_multicast_list(struct net_device *dev)
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;
if (!dev) if (!dev)
return; return;
...@@ -2250,7 +2197,6 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -2250,7 +2197,6 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev)
QueueCount = WILC_Xmit_data((void *)tx_data, HOST_TO_WLAN); QueueCount = WILC_Xmit_data((void *)tx_data, HOST_TO_WLAN);
#endif /* WILC_FULLY_HOSTING_AP */ #endif /* WILC_FULLY_HOSTING_AP */
if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) { if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) {
netif_stop_queue(g_linux_wlan->strInterfaceInfo[0].wilc_netdev); netif_stop_queue(g_linux_wlan->strInterfaceInfo[0].wilc_netdev);
netif_stop_queue(g_linux_wlan->strInterfaceInfo[1].wilc_netdev); netif_stop_queue(g_linux_wlan->strInterfaceInfo[1].wilc_netdev);
...@@ -2259,7 +2205,6 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -2259,7 +2205,6 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev)
return 0; return 0;
} }
int mac_close(struct net_device *ndev) int mac_close(struct net_device *ndev)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
...@@ -2282,8 +2227,6 @@ int mac_close(struct net_device *ndev) ...@@ -2282,8 +2227,6 @@ int mac_close(struct net_device *ndev)
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;
PRINT_D(GENERIC_DBG, "Mac close\n"); PRINT_D(GENERIC_DBG, "Mac close\n");
if (g_linux_wlan == NULL) { if (g_linux_wlan == NULL) {
...@@ -2329,7 +2272,6 @@ int mac_close(struct net_device *ndev) ...@@ -2329,7 +2272,6 @@ int mac_close(struct net_device *ndev)
return 0; return 0;
} }
int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
{ {
...@@ -2340,8 +2282,6 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) ...@@ -2340,8 +2282,6 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
s32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
/* struct iwreq *wrq = (struct iwreq *) req; // tony moved to case SIOCSIWPRIV */ /* struct iwreq *wrq = (struct iwreq *) req; // tony moved to case SIOCSIWPRIV */
#ifdef USE_WIRELESS #ifdef USE_WIRELESS
nic = netdev_priv(ndev); nic = netdev_priv(ndev);
...@@ -2435,7 +2375,6 @@ void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset) ...@@ -2435,7 +2375,6 @@ void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset)
frame_len = size; frame_len = size;
buff_to_send = buff; buff_to_send = buff;
/* Need to send the packet up to the host, allocate a skb buffer */ /* Need to send the packet up to the host, allocate a skb buffer */
skb = dev_alloc_skb(frame_len); skb = dev_alloc_skb(frame_len);
if (skb == NULL) { if (skb == NULL) {
...@@ -2600,7 +2539,6 @@ int wilc_netdev_init(void) ...@@ -2600,7 +2539,6 @@ int wilc_netdev_init(void)
} }
#endif #endif
if (register_netdev(ndev)) { if (register_netdev(ndev)) {
PRINT_ER("Device couldn't be registered - %s\n", ndev->name); PRINT_ER("Device couldn't be registered - %s\n", ndev->name);
return -1; /* ERROR */ return -1; /* ERROR */
...@@ -2624,12 +2562,9 @@ int wilc_netdev_init(void) ...@@ -2624,12 +2562,9 @@ int wilc_netdev_init(void)
return 0; return 0;
} }
/*The 1st function called after module inserted*/ /*The 1st function called after module inserted*/
static int __init init_wilc_driver(void) static int __init init_wilc_driver(void)
{ {
#if defined (WILC_DEBUGFS) #if defined (WILC_DEBUGFS)
if (wilc_debugfs_init() < 0) { if (wilc_debugfs_init() < 0) {
PRINT_D(GENERIC_DBG, "fail to create debugfs for wilc driver\n"); PRINT_D(GENERIC_DBG, "fail to create debugfs for wilc driver\n");
...@@ -2679,13 +2614,11 @@ static void __exit exit_wilc_driver(void) ...@@ -2679,13 +2614,11 @@ static void __exit exit_wilc_driver(void)
nic[i] = netdev_priv(g_linux_wlan->strInterfaceInfo[i].wilc_netdev); nic[i] = netdev_priv(g_linux_wlan->strInterfaceInfo[i].wilc_netdev);
} }
if ((g_linux_wlan != NULL) && g_linux_wlan->wilc_firmware != NULL) { if ((g_linux_wlan != NULL) && g_linux_wlan->wilc_firmware != NULL) {
release_firmware(g_linux_wlan->wilc_firmware); release_firmware(g_linux_wlan->wilc_firmware);
g_linux_wlan->wilc_firmware = NULL; g_linux_wlan->wilc_firmware = NULL;
} }
if ((g_linux_wlan != NULL) && (((g_linux_wlan->strInterfaceInfo[0].wilc_netdev) != NULL) if ((g_linux_wlan != NULL) && (((g_linux_wlan->strInterfaceInfo[0].wilc_netdev) != NULL)
|| ((g_linux_wlan->strInterfaceInfo[1].wilc_netdev) != NULL))) { || ((g_linux_wlan->strInterfaceInfo[1].wilc_netdev) != NULL))) {
PRINT_D(INIT_DBG, "Waiting for mac_close ....\n"); PRINT_D(INIT_DBG, "Waiting for mac_close ....\n");
...@@ -2695,7 +2628,6 @@ static void __exit exit_wilc_driver(void) ...@@ -2695,7 +2628,6 @@ static void __exit exit_wilc_driver(void)
else else
PRINT_D(INIT_DBG, "mac_closed\n"); PRINT_D(INIT_DBG, "mac_closed\n");
for (i = 0; i < NUM_CONCURRENT_IFC; i++) { for (i = 0; i < NUM_CONCURRENT_IFC; i++) {
/* close all opened interfaces */ /* close all opened interfaces */
if (g_linux_wlan->strInterfaceInfo[i].wilc_netdev != NULL) { if (g_linux_wlan->strInterfaceInfo[i].wilc_netdev != NULL) {
...@@ -2715,7 +2647,6 @@ static void __exit exit_wilc_driver(void) ...@@ -2715,7 +2647,6 @@ static void __exit exit_wilc_driver(void)
} }
} }
#ifdef USE_WIRELESS #ifdef USE_WIRELESS
#ifdef WILC_AP_EXTERNAL_MLME #ifdef WILC_AP_EXTERNAL_MLME
/* Bug 4600 : WILC_WFI_deinit_mon_interface was already called at mac_close */ /* Bug 4600 : WILC_WFI_deinit_mon_interface was already called at mac_close */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7