Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / csr / csr_wifi_nme_ap_prim.h

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
index 5e08d53982ffaed85d4e6272b7968d1ed142b5e2..fc44560b28b8b68a3305b320043e88756547e698 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_NME_AP_PRIM_H__
 #define CSR_WIFI_NME_AP_PRIM_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
@@ -77,10 +77,10 @@ typedef u8 CsrWifiNmeApPersCredentialType;
 *******************************************************************************/
 typedef struct
 {
-    CsrUint16 apGroupkeyTimeout;
-    CsrBool   apStrictGtkRekey;
-    CsrUint16 apGmkTimeout;
-    CsrUint16 apResponseTimeout;
+    u16 apGroupkeyTimeout;
+    u8   apStrictGtkRekey;
+    u16 apGmkTimeout;
+    u16 apResponseTimeout;
     u8  apRetransLimit;
 } CsrWifiNmeApConfig;
 
@@ -222,7 +222,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent         common;
-    CsrUint16               interfaceTag;
+    u16               interfaceTag;
     CsrWifiSmeWpsDpid       selectedDevicePasswordId;
     CsrWifiSmeWpsConfigType selectedConfigMethod;
     u8                pin[8];
@@ -254,16 +254,16 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent         common;
-    CsrUint16               interfaceTag;
+    u16               interfaceTag;
     CsrWifiSmeApType        apType;
-    CsrBool                 cloakSsid;
+    u8                 cloakSsid;
     CsrWifiSsid             ssid;
     CsrWifiSmeRadioIF       ifIndex;
     u8                channel;
     CsrWifiNmeApCredentials apCredentials;
     u8                maxConnections;
     CsrWifiSmeApP2pGoConfig p2pGoParam;
-    CsrBool                 wpsEnabled;
+    u8                 wpsEnabled;
 } CsrWifiNmeApStartReq;
 
 /*******************************************************************************
@@ -282,7 +282,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent common;
-    CsrUint16       interfaceTag;
+    u16       interfaceTag;
 } CsrWifiNmeApStopReq;
 
 /*******************************************************************************
@@ -332,9 +332,9 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent   common;
-    CsrUint16         interfaceTag;
+    u16         interfaceTag;
     CsrWifiMacAddress staMacAddress;
-    CsrBool           keepBlocking;
+    u8           keepBlocking;
 } CsrWifiNmeApStaRemoveReq;
 
 /*******************************************************************************
@@ -373,7 +373,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent common;
-    CsrUint16       interfaceTag;
+    u16       interfaceTag;
     CsrResult       status;
 } CsrWifiNmeApWpsRegisterCfm;
 
@@ -395,7 +395,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent common;
-    CsrUint16       interfaceTag;
+    u16       interfaceTag;
     CsrResult       status;
     CsrWifiSsid     ssid;
 } CsrWifiNmeApStartCfm;
@@ -419,7 +419,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent common;
-    CsrUint16       interfaceTag;
+    u16       interfaceTag;
     CsrResult       status;
 } CsrWifiNmeApStopCfm;
 
@@ -443,7 +443,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent  common;
-    CsrUint16        interfaceTag;
+    u16        interfaceTag;
     CsrWifiSmeApType apType;
     CsrResult        status;
 } CsrWifiNmeApStopInd;
@@ -488,7 +488,7 @@ typedef struct
 typedef struct
 {
     CsrWifiFsmEvent       common;
-    CsrUint16             interfaceTag;
+    u16             interfaceTag;
     CsrWifiSmeMediaStatus mediaStatus;
     CsrWifiMacAddress     peerMacAddress;
     CsrWifiMacAddress     peerDeviceAddress;