staging: wilc1000: remove define WILC_AP_EXTERNAL_MLME and ifdef line

[deliverable/linux.git] / drivers / staging / wilc1000 / wilc_wlan.h

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 244f7108ae92a153172864c77d8d30683ac1e1ca..c6f15561bda8e312cd6ac9922bdec745d60c4b33 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -36,9 +36,6 @@
                                   ETH_CONFIG_PKT_HDR_LEN)
 #define   ACTION         0xD0
 #define   PROBE_REQ   0x40
-#ifdef WILC_FULLY_HOSTING_AP
-#define        FH_TX_HOST_HDR_OFFSET   24
-#endif
 
 /********************************************
  *
@@ -142,14 +139,8 @@
 #define WILC_CFG_PKT   1
 #define WILC_NET_PKT 0
 /*Bug3959: transmitting mgmt frames received from host*/
-#ifdef WILC_AP_EXTERNAL_MLME
 #define WILC_MGMT_PKT 2
 
-#ifdef WILC_FULLY_HOSTING_AP
-#define WILC_FH_DATA_PKT 4
-#endif
-
-#endif /*WILC_AP_EXTERNAL_MLME*/
 #define WILC_CFG_SET 1
 #define WILC_CFG_QUERY 0
 
@@ -234,7 +225,7 @@
  *      Debug Type
  *
  ********************************************/
-typedef void (*wilc_debug_func)(uint32_t, char *, ...);
+typedef void (*wilc_debug_func)(u32, char *, ...);
 
 /********************************************
  *
@@ -247,7 +238,7 @@ struct txq_entry_t {
        struct txq_entry_t *prev;
        int type;
        int tcp_PendingAck_index;
-       uint8_t *buffer;
+       u8 *buffer;
        int buffer_size;
        void *priv;
        int status;
@@ -256,7 +247,7 @@ struct txq_entry_t {
 
 struct rxq_entry_t {
        struct rxq_entry_t *next;
-       uint8_t *buffer;
+       u8 *buffer;
        int buffer_size;
 };
 
@@ -269,17 +260,17 @@ struct rxq_entry_t {
 typedef struct {
        int (*hif_init)(wilc_wlan_inp_t *, wilc_debug_func);
        int (*hif_deinit)(void *);
-       int (*hif_read_reg)(uint32_t, uint32_t *);
-       int (*hif_write_reg)(uint32_t, uint32_t);
-       int (*hif_block_rx)(uint32_t, uint8_t *, uint32_t);
-       int (*hif_block_tx)(uint32_t, uint8_t *, uint32_t);
+       int (*hif_read_reg)(u32, u32 *);
+       int (*hif_write_reg)(u32, u32);
+       int (*hif_block_rx)(u32, u8 *, u32);
+       int (*hif_block_tx)(u32, u8 *, u32);
        int (*hif_sync)(void);
        int (*hif_clear_int)(void);
-       int (*hif_read_int)(uint32_t *);
-       int (*hif_clear_int_ext)(uint32_t);
-       int (*hif_read_size)(uint32_t *);
-       int (*hif_block_tx_ext)(uint32_t, uint8_t *, uint32_t);
-       int (*hif_block_rx_ext)(uint32_t, uint8_t *, uint32_t);
+       int (*hif_read_int)(u32 *);
+       int (*hif_clear_int_ext)(u32);
+       int (*hif_read_size)(u32 *);
+       int (*hif_block_tx_ext)(u32, u8 *, u32);
+       int (*hif_block_rx_ext)(u32, u8 *, u32);
        int (*hif_sync_ext)(int);
        void (*hif_set_max_bus_speed)(void);
        void (*hif_set_default_bus_speed)(void);
@@ -294,27 +285,27 @@ typedef struct {
 #define MAX_CFG_FRAME_SIZE 1468
 
 typedef struct {
-       uint8_t ether_header[14];
-       uint8_t ip_header[20];
-       uint8_t udp_header[8];
-       uint8_t wid_header[8];
-       uint8_t frame[MAX_CFG_FRAME_SIZE];
+       u8 ether_header[14];
+       u8 ip_header[20];
+       u8 udp_header[8];
+       u8 wid_header[8];
+       u8 frame[MAX_CFG_FRAME_SIZE];
 } wilc_cfg_frame_t;
 
 typedef struct {
-       int (*wlan_tx)(uint8_t *, uint32_t, wilc_tx_complete_func_t);
+       int (*wlan_tx)(u8 *, u32, wilc_tx_complete_func_t);
 } wilc_wlan_cfg_func_t;
 
 typedef struct {
        int type;
-       uint32_t seq_no;
+       u32 seq_no;
 } wilc_cfg_rsp_t;
 
 typedef struct {
-       int (*cfg_wid_set)(uint8_t *, uint32_t, uint16_t, uint8_t *, int);
-       int (*cfg_wid_get)(uint8_t *, uint32_t, uint16_t);
-       int (*cfg_wid_get_val)(uint16_t, uint8_t *, uint32_t);
-       int (*rx_indicate)(uint8_t *, int, wilc_cfg_rsp_t *);
+       int (*cfg_wid_set)(u8 *, u32, u16, u8 *, int);
+       int (*cfg_wid_get)(u8 *, u32, u16);
+       int (*cfg_wid_get_val)(u16, u8 *, u32);
+       int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);
        int (*cfg_init)(wilc_debug_func);
 } wilc_cfg_func_t;