staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv

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

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
index 97b663b7fd1496952097ddab1d053342c33298bf..39cd8e1b567567efc8ad161b42a14820a3fcf224 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
@@ -10,63 +10,44 @@
 #define NM_WFI_CFGOPERATIONS
 #include "wilc_wfi_netdevice.h"
 
-#ifdef WILC_FULLY_HOSTING_AP
-#include "wilc_host_ap.h"
-#endif
-
-
 /* The following macros describe the bitfield map used by the firmware to determine its 11i mode */
-#define NO_ENCRYPT                     0
-#define ENCRYPT_ENABLED        (1 << 0)
-#define WEP                                    (1 << 1)
-#define WEP_EXTENDED           (1 << 2)
-#define WPA                                    (1 << 3)
-#define WPA2                           (1 << 4)
-#define AES                                    (1 << 5)
-#define TKIP                                   (1 << 6)
-
-#ifdef WILC_P2P
-/* #define     USE_SUPPLICANT_GO_INTENT */
+#define NO_ENCRYPT             0
+#define ENCRYPT_ENABLED                BIT(0)
+#define WEP                    BIT(1)
+#define WEP_EXTENDED           BIT(2)
+#define WPA                    BIT(3)
+#define WPA2                   BIT(4)
+#define AES                    BIT(5)
+#define TKIP                   BIT(6)
 
 /*Public action frame index IDs*/
-#define                FRAME_TYPE_ID                                   0
-#define                ACTION_CAT_ID                                   24
-#define                ACTION_SUBTYPE_ID                               25
-#define                P2P_PUB_ACTION_SUBTYPE          30
+#define FRAME_TYPE_ID                  0
+#define ACTION_CAT_ID                  24
+#define ACTION_SUBTYPE_ID              25
+#define P2P_PUB_ACTION_SUBTYPE         30
 
 /*Public action frame Attribute IDs*/
-#define                ACTION_FRAME                                    0xd0
-#define                GO_INTENT_ATTR_ID                       0x04
-#define                CHANLIST_ATTR_ID                0x0b
-#define                OPERCHAN_ATTR_ID                0x11
-#ifdef USE_SUPPLICANT_GO_INTENT
-#define        GROUP_BSSID_ATTR_ID                     0x07
-#endif
-#define                PUB_ACTION_ATTR_ID                      0x04
-#define                P2PELEM_ATTR_ID                     0xdd
+#define ACTION_FRAME                   0xd0
+#define GO_INTENT_ATTR_ID              0x04
+#define CHANLIST_ATTR_ID               0x0b
+#define OPERCHAN_ATTR_ID               0x11
+#define PUB_ACTION_ATTR_ID             0x04
+#define P2PELEM_ATTR_ID                        0xdd
 
 /*Public action subtype values*/
-#define                GO_NEG_REQ                                      0x00
-#define                GO_NEG_RSP                                      0x01
-#define                GO_NEG_CONF                                     0x02
-#define                P2P_INV_REQ                         0x03
-#define                P2P_INV_RSP                             0x04
-#define                PUBLIC_ACT_VENDORSPEC           0x09
-#define                GAS_INTIAL_REQ                                  0x0a
-#define                GAS_INTIAL_RSP                                  0x0b
+#define GO_NEG_REQ                     0x00
+#define GO_NEG_RSP                     0x01
+#define GO_NEG_CONF                    0x02
+#define P2P_INV_REQ                    0x03
+#define P2P_INV_RSP                    0x04
+#define PUBLIC_ACT_VENDORSPEC          0x09
+#define GAS_INTIAL_REQ                 0x0a
+#define GAS_INTIAL_RSP                 0x0b
 
-#define                INVALID_CHANNEL                                 0
-#ifdef USE_SUPPLICANT_GO_INTENT
-#define                SUPPLICANT_GO_INTENT                    6
-#define                GET_GO_INTENT(a)                                (((a) >> 1) & 0x0f)
-#define                GET_TIE_BREAKER(a)                      (((a)) & 0x01)
-#else
-/* #define FORCE_P2P_CLIENT */
-#endif
-#endif
+#define INVALID_CHANNEL                        0
 
 #define nl80211_SCAN_RESULT_EXPIRE     (3 * HZ)
-#define SCAN_RESULT_EXPIRE                             (40 * HZ)
+#define SCAN_RESULT_EXPIRE             (40 * HZ)
 
 static const u32 cipher_suites[] = {
        WLAN_CIPHER_SUITE_WEP40,
@@ -99,7 +80,6 @@ static const struct ieee80211_txrx_stypes
                        BIT(IEEE80211_STYPE_PROBE_REQ >> 4) |
                        BIT(IEEE80211_STYPE_ASSOC_REQ >> 4) |
                        BIT(IEEE80211_STYPE_REASSOC_REQ >> 4) |
-                       BIT(IEEE80211_STYPE_PROBE_REQ >> 4) |
                        BIT(IEEE80211_STYPE_DISASSOC >> 4) |
                        BIT(IEEE80211_STYPE_AUTH >> 4) |
                        BIT(IEEE80211_STYPE_DEAUTH >> 4)
@@ -111,19 +91,19 @@ static const struct ieee80211_txrx_stypes
 #define WILC_WFI_DWELL_ACTIVE  40
 
 struct wireless_dev *WILC_WFI_CfgAlloc(void);
-struct wireless_dev *WILC_WFI_WiphyRegister(struct net_device *net);
-void WILC_WFI_WiphyFree(struct net_device *net);
+struct wireless_dev *wilc_create_wiphy(struct net_device *net);
+void wilc_free_wiphy(struct net_device *net);
 int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed);
-int WILC_WFI_DeInitHostInt(struct net_device *net);
-int WILC_WFI_InitHostInt(struct net_device *net);
-void WILC_WFI_monitor_rx(uint8_t *buff, uint32_t size);
+int wilc_deinit_host_int(struct net_device *net);
+int wilc_init_host_int(struct net_device *net);
+void WILC_WFI_monitor_rx(u8 *buff, u32 size);
 int WILC_WFI_deinit_mon_interface(void);
 struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_device *real_dev);
+void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
+                             u16 frame_type, bool reg);
 
-#ifdef TCP_ENHANCEMENTS
-#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
-#define DEFAULT_LINK_SPEED 72
+#define TCP_ACK_FILTER_LINK_SPEED_THRESH       54
+#define DEFAULT_LINK_SPEED                     72
 void Enable_TCP_ACK_Filter(bool value);
-#endif
 
 #endif