Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 863571abaecabe10bb3ddb8bc629dc6a525f9a97..0bfe7626ad2d22a5f0db9007d3700b6e8511c5ed 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -149,10 +149,10 @@ typedef struct {
 } struct_frame_reg;
 
 struct wilc_vif {
-       u8 aSrcAddress[ETH_ALEN];
-       u8 aBSSID[ETH_ALEN];
-       struct host_if_drv *drvHandler;
-       struct net_device *wilc_netdev;
+       u8 src_addr[ETH_ALEN];
+       u8 bssid[ETH_ALEN];
+       struct host_if_drv *hif_drv;
+       struct net_device *ndev;
 };
 
 struct wilc {
@@ -162,8 +162,8 @@ struct wilc {
        unsigned short dev_irq_num;
        #endif
        int close;
-       u8 u8NoIfcs;
-       struct wilc_vif strInterfaceInfo[NUM_CONCURRENT_IFC];
+       u8 vif_num;
+       struct wilc_vif vif[NUM_CONCURRENT_IFC];
        u8 open_ifcs;
 
        struct semaphore txq_add_to_head_cs;
@@ -182,7 +182,7 @@ struct wilc {
 
        unsigned char eth_src_address[NUM_CONCURRENT_IFC][6];
 
-       const struct firmware *wilc_firmware;
+       const struct firmware *firmware;
 
 #ifdef WILC_SDIO
        struct sdio_func *wilc_sdio_func;
@@ -199,7 +199,7 @@ typedef struct {
        struct_frame_reg g_struct_frame_reg[num_reg_frame];
        struct net_device *wilc_netdev;
        struct net_device_stats netstats;
-
+       struct wilc *wilc;
 } perInterface_wlan_t;
 
 struct WILC_WFI_mon_priv {
@@ -208,10 +208,14 @@ struct WILC_WFI_mon_priv {
 
 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);
+void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
+void linux_wlan_mac_indicate(struct wilc *wilc, int flag);
 void linux_wlan_rx_complete(void);
 void linux_wlan_dbg(u8 *buff);
 int linux_wlan_lock_timeout(void *vp, u32 timeout);
-
+void wl_wlan_cleanup(void);
+int wilc_netdev_init(struct wilc **wilc);
+void wilc1000_wlan_deinit(struct net_device *dev);
+void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
+u16 Set_machw_change_vir_if(struct net_device *dev, bool bValue);
 #endif