staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file

Move data structure and function prototype from 'wilc_wlan_if.h file.
Now, this file contains constant specific to the firmware.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 9abe341e2abf722c5b3ba8c571b215b9f6901265..50dc2dd942f5bc72ead59925b6320ed98de7f016 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -10,6 +10,7 @@
 #define WILC_HIF_CONNECT_TIMEOUT_MS             9500
 
 #define WILC_FALSE_FRMWR_CHANNEL               100
+#define WILC_MAX_RATES_SUPPORTED               12
 
 struct wilc_rcvd_mac_info {
        u8 status;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index a00762519cc422ddb7df3aaaf062ef6d1d0a61e6..678e62312215cc144d538e6d5b7fc7fba0241204 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -97,6 +97,17 @@ enum conn_event {
        CONN_DISCONN_EVENT_FORCE_32BIT          = 0xFFFFFFFF
 };
 
+enum {
+       WILC_HIF_SDIO = 0,
+       WILC_HIF_SPI = BIT(0)
+};
+
+enum {
+       WILC_MAC_STATUS_INIT = -1,
+       WILC_MAC_STATUS_DISCONNECTED = 0,
+       WILC_MAC_STATUS_CONNECTED = 1
+};
+
 struct wilc_rcvd_net_info {
        s8 rssi;
        u8 ch;

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index f3e52af6cc7edebef87b095dd5da772382a1a9bd..1ebf2b86606aaeee3ffb2400358960ed6a66f17a 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -12,6 +12,8 @@
 
 #include "wilc_wfi_cfgoperations.h"
 
+#define WILC_MULTICAST_TABLE_SIZE      8
+
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
        struct net_device *dev = user_data;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index d8fabe8e8a9b131f1a2acd2eda8954b766f14533..1a27f62589a282f6ff7ff1c624349c99821a3f0a 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -250,6 +250,13 @@ struct wilc_hif_func {
 
 #define WILC_MAX_CFG_FRAME_SIZE                1468
 
+struct tx_complete_data {
+       int size;
+       void *buff;
+       u8 *bssid;
+       struct sk_buff *skb;
+};
+
 struct wilc_cfg_cmd_hdr {
        u8 cmd_type;
        u8 seq_no;
@@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc);
 void chip_wakeup(struct wilc *wilc);
 int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
                         u32 count, u32 drv);
+int wilc_wlan_init(struct net_device *dev);
+u32 wilc_get_chipid(struct wilc *wilc, bool update);
 #endif

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 9b8cce80a5903e4808df7b3468a44e5d0e120f9c..b15de36e32e04e410c6138ef7ec4eb11d9d8c40c 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -9,43 +9,11 @@
 
 #include <linux/netdevice.h>
 
-/********************************************
- *
- *      Host Interface Defines
- *
- ********************************************/
-
-enum {
-       WILC_HIF_SDIO = 0,
-       WILC_HIF_SPI = BIT(0)
-};
-
-/********************************************
- *
- *      Wlan Interface Defines
- *
- ********************************************/
-
-enum {
-       WILC_MAC_STATUS_INIT = -1,
-       WILC_MAC_STATUS_DISCONNECTED = 0,
-       WILC_MAC_STATUS_CONNECTED = 1
-};
-
-struct tx_complete_data {
-       int size;
-       void *buff;
-       u8 *bssid;
-       struct sk_buff *skb;
-};
-
 /********************************************
  *
  *      Wlan Configuration ID
  *
  ********************************************/
-#define WILC_MULTICAST_TABLE_SIZE      8
-#define WILC_MAX_RATES_SUPPORTED     12
 
 enum bss_types {
        WILC_FW_BSS_TYPE_INFRA = 0,
@@ -832,8 +800,4 @@ enum {
        WID_MAX                         = 0xFFFF
 };
 
-struct wilc;
-int wilc_wlan_init(struct net_device *dev);
-u32 wilc_get_chipid(struct wilc *wilc, bool update);
-
 #endif