Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6656 / bssdb.h

diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
index 806cbf72fb59b6f58eb1419d98af755475fed311..9ee37b9ede3cc961f3e317856d74e3a1f92fa0e8 100644 (file)
--- a/drivers/staging/vt6656/bssdb.h
+++ b/drivers/staging/vt6656/bssdb.h
@@ -141,8 +141,8 @@ typedef struct tagKnownBSS {
     unsigned int            uClearCount;
 //    BYTE            abyIEs[WLAN_BEACON_FR_MAXLEN];
     unsigned int            uIELength;
-    QWORD           qwBSSTimestamp;
-    QWORD           qwLocalTSF;     // local TSF timer
+       u64 qwBSSTimestamp;
+       u64 qwLocalTSF;/* local TSF timer */
 
     CARD_PHY_TYPE   eNetworkTypeInUse;
 
@@ -225,80 +225,70 @@ typedef struct tagKnownNodeDB {
 
 /*---------------------  Export Functions  --------------------------*/
 
-PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
-                           PBYTE pbyDesireBSSID,
-                           PBYTE pbyDesireSSID,
-                           CARD_PHY_TYPE ePhyType);
-
-PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext,
-                             PBYTE abyBSSID,
-                             PWLAN_IE_SSID pSSID);
-
-void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID);
-
-BOOL BSSbInsertToBSSList(void *hDeviceContext,
-                        PBYTE abyBSSIDAddr,
-                        QWORD qwTimestamp,
-                        WORD wBeaconInterval,
-                        WORD wCapInfo,
-                        BYTE byCurrChannel,
-                        PWLAN_IE_SSID pSSID,
-                        PWLAN_IE_SUPP_RATES pSuppRates,
-                        PWLAN_IE_SUPP_RATES pExtSuppRates,
-                        PERPObject psERP,
-                        PWLAN_IE_RSN pRSN,
-                        PWLAN_IE_RSN_EXT pRSNWPA,
-                        PWLAN_IE_COUNTRY pIE_Country,
-                        PWLAN_IE_QUIET pIE_Quiet,
-                        unsigned int uIELength,
-                        PBYTE pbyIEs,
-                        void *pRxPacketContext);
-
-BOOL BSSbUpdateToBSSList(void *hDeviceContext,
-                        QWORD qwTimestamp,
-                        WORD wBeaconInterval,
-                        WORD wCapInfo,
-                        BYTE byCurrChannel,
-                        BOOL bChannelHit,
-                        PWLAN_IE_SSID pSSID,
-                        PWLAN_IE_SUPP_RATES pSuppRates,
-                        PWLAN_IE_SUPP_RATES pExtSuppRates,
-                        PERPObject psERP,
-                        PWLAN_IE_RSN pRSN,
-                        PWLAN_IE_RSN_EXT pRSNWPA,
-                        PWLAN_IE_COUNTRY pIE_Country,
-                        PWLAN_IE_QUIET pIE_Quiet,
-                        PKnownBSS pBSSList,
-                        unsigned int uIELength,
-                        PBYTE pbyIEs,
-                        void *pRxPacketContext);
-
-BOOL BSSbIsSTAInNodeDB(void *hDeviceContext,
-                      PBYTE abyDstAddr,
-                      unsigned int *puNodeIndex);
-
-void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex);
-
-void BSSvUpdateAPNode(void *hDeviceContext,
-                     PWORD pwCapInfo,
-                     PWLAN_IE_SUPP_RATES pItemRates,
-                     PWLAN_IE_SUPP_RATES pExtSuppRates);
-
-void BSSvSecondCallBack(void *hDeviceContext);
-
-void BSSvUpdateNodeTxCounter(void *hDeviceContext,
-                            PSStatCounter pStatistic,
-                            BYTE byTSR,
-                            BYTE byPktNO);
-
-void BSSvRemoveOneNode(void *hDeviceContext,
-                      unsigned int uNodeIndex);
-
-void BSSvAddMulticastNode(void *hDeviceContext);
-
-void BSSvClearNodeDBTable(void *hDeviceContext,
-                         unsigned int uStartIndex);
-
-void BSSvClearAnyBSSJoinRecord(void *hDeviceContext);
+PKnownBSS BSSpSearchBSSList(struct vnt_private *, u8 *pbyDesireBSSID,
+       u8 *pbyDesireSSID, CARD_PHY_TYPE ePhyType);
+
+PKnownBSS BSSpAddrIsInBSSList(struct vnt_private *, u8 *abyBSSID,
+       PWLAN_IE_SSID pSSID);
+
+void BSSvClearBSSList(struct vnt_private *, int bKeepCurrBSSID);
+
+int BSSbInsertToBSSList(struct vnt_private *,
+                       u8 *abyBSSIDAddr,
+                       u64 qwTimestamp,
+                       u16 wBeaconInterval,
+                       u16 wCapInfo,
+                       u8 byCurrChannel,
+                       PWLAN_IE_SSID pSSID,
+                       PWLAN_IE_SUPP_RATES pSuppRates,
+                       PWLAN_IE_SUPP_RATES pExtSuppRates,
+                       PERPObject psERP,
+                       PWLAN_IE_RSN pRSN,
+                       PWLAN_IE_RSN_EXT pRSNWPA,
+                       PWLAN_IE_COUNTRY pIE_Country,
+                       PWLAN_IE_QUIET pIE_Quiet,
+                       u32 uIELength,
+                       u8 *pbyIEs,
+                       void *pRxPacketContext);
+
+int BSSbUpdateToBSSList(struct vnt_private *,
+                       u64 qwTimestamp,
+                       u16 wBeaconInterval,
+                       u16 wCapInfo,
+                       u8 byCurrChannel,
+                       int bChannelHit,
+                       PWLAN_IE_SSID pSSID,
+                       PWLAN_IE_SUPP_RATES pSuppRates,
+                       PWLAN_IE_SUPP_RATES pExtSuppRates,
+                       PERPObject psERP,
+                       PWLAN_IE_RSN pRSN,
+                       PWLAN_IE_RSN_EXT pRSNWPA,
+                       PWLAN_IE_COUNTRY pIE_Country,
+                       PWLAN_IE_QUIET pIE_Quiet,
+                       PKnownBSS pBSSList,
+                       u32 uIELength,
+                       u8 *pbyIEs,
+                       void *pRxPacketContext);
+
+int BSSbIsSTAInNodeDB(struct vnt_private *, PBYTE abyDstAddr,
+       u32 *puNodeIndex);
+
+void BSSvCreateOneNode(struct vnt_private *, u32 *puNodeIndex);
+
+void BSSvUpdateAPNode(struct vnt_private *, u16 *pwCapInfo,
+       PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pExtSuppRates);
+
+void BSSvSecondCallBack(struct vnt_private *);
+
+void BSSvUpdateNodeTxCounter(struct vnt_private *, PSStatCounter pStatistic,
+       u8 byTSR, u8 byPktNO);
+
+void BSSvRemoveOneNode(struct vnt_private *, u32 uNodeIndex);
+
+void BSSvAddMulticastNode(struct vnt_private *);
+
+void BSSvClearNodeDBTable(struct vnt_private *, u32 uStartIndex);
+
+void BSSvClearAnyBSSJoinRecord(struct vnt_private *);
 
 #endif /* __BSSDB_H__ */