staging: wilc1000: remove typedef from the tstrInterfaceInfo

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / wilc_wfi_netdevice.h

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 81c1ad376600737e9ebdeec1c680d98c587a0c79..c5061fd07312d674ec0bd571ba3f5cb5f857c5e1 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -8,12 +8,10 @@
 #ifndef WILC_WFI_NETDEVICE
 #define WILC_WFI_NETDEVICE
 
-/* These are the flags in the statusword */
 #define WILC_WFI_RX_INTR 0x0001
 #define WILC_WFI_TX_INTR 0x0002
 
-/* Default timeout period */
-#define WILC_WFI_TIMEOUT 5   /* In jiffies */
+#define WILC_WFI_TIMEOUT 5
 #define WILC_MAX_NUM_PMKIDS  16
 #define PMKID_LEN  16
 #define PMKID_FOUND 1
@@ -24,16 +22,16 @@
 #include <linux/moduleparam.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
-#include <linux/slab.h> /* kmalloc() */
-#include <linux/errno.h>  /* error codes */
-#include <linux/types.h>  /* size_t */
-#include <linux/interrupt.h> /* mark_bh */
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/in.h>
-#include <linux/netdevice.h>   /* struct device, and other headers */
-#include <linux/etherdevice.h> /* eth_type_trans */
-#include <linux/ip.h>          /* struct iphdr */
-#include <linux/tcp.h>         /* struct tcphdr */
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
 #include <linux/skbuff.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
@@ -45,12 +43,11 @@
 #include <asm/checksum.h>
 #include "host_interface.h"
 #include "wilc_wlan.h"
-#include <linux/wireless.h>     /* tony, 2013-06-12 */
+#include <linux/wireless.h>
 
 #define FLOW_CONTROL_LOWER_THRESHOLD   128
 #define FLOW_CONTROL_UPPER_THRESHOLD   256
 
-/*iftype*/
 enum stats_flags {
        WILC_WFI_RX_PKT = BIT(0),
        WILC_WFI_TX_PKT = BIT(1),
@@ -124,8 +121,8 @@ struct wilc_priv {
        spinlock_t lock;
        struct net_device *dev;
        struct napi_struct napi;
-       tstrWILC_WFIDrv *hWILCWFIDrv;
-       tstrHostIFpmkidAttr pmkid_list;
+       struct host_if_drv *hWILCWFIDrv;
+       struct host_if_pmkid_attr pmkid_list;
        struct WILC_WFI_stats netstats;
        u8 WILC_WFI_wep_default;
        u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
@@ -151,13 +148,14 @@ typedef struct {
 
 } struct_frame_reg;
 
-typedef struct {
+struct wilc_vif {
        u8 aSrcAddress[ETH_ALEN];
        u8 aBSSID[ETH_ALEN];
-       tstrWILC_WFIDrv *drvHandler;
+       struct host_if_drv *drvHandler;
        struct net_device *wilc_netdev;
-} tstrInterfaceInfo;
-typedef struct {
+};
+
+struct wilc {
        int mac_status;
        int wilc1000_initialized;
        #if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
@@ -165,7 +163,7 @@ typedef struct {
        #endif
        int close;
        u8 u8NoIfcs;
-       tstrInterfaceInfo strInterfaceInfo[NUM_CONCURRENT_IFC];
+       struct wilc_vif strInterfaceInfo[NUM_CONCURRENT_IFC];
        u8 open_ifcs;
 
        struct semaphore txq_add_to_head_cs;
@@ -183,7 +181,6 @@ typedef struct {
        struct task_struct *txq_thread;
 
        unsigned char eth_src_address[NUM_CONCURRENT_IFC][6];
-       /* unsigned char eth_dst_address[6]; */
 
        const struct firmware *wilc_firmware;
 
@@ -192,8 +189,7 @@ typedef struct {
 #else
        struct spi_device *wilc_spidev;
 #endif
-
-} linux_wlan_t;
+};
 
 typedef struct {
        u8 u8IfIdx;
@@ -210,7 +206,7 @@ struct WILC_WFI_mon_priv {
        struct net_device *real_ndev;
 };
 
-extern linux_wlan_t *g_linux_wlan;
+extern struct wilc *g_linux_wlan;
 extern struct net_device *WILC_WFI_devs[];
 void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);
 void linux_wlan_mac_indicate(int flag);