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 5fd0757b92052e9e805695a42ca062d71a4c9c65..39cd8e1b567567efc8ad161b42a14820a3fcf224 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
@@ -20,8 +20,6 @@
 #define AES                    BIT(5)
 #define TKIP                   BIT(6)
 
-#ifdef WILC_P2P
-
 /*Public action frame index IDs*/
 #define FRAME_TYPE_ID                  0
 #define ACTION_CAT_ID                  24
@@ -47,7 +45,6 @@
 #define GAS_INTIAL_RSP                 0x0b
 
 #define INVALID_CHANNEL                        0
-#endif
 
 #define nl80211_SCAN_RESULT_EXPIRE     (3 * HZ)
 #define SCAN_RESULT_EXPIRE             (40 * HZ)
@@ -83,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)
@@ -95,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);
+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
 void Enable_TCP_ACK_Filter(bool value);
-#endif
 
 #endif