diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/vt6655/bssdb.h | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/vt6655/bssdb.h')
-rw-r--r-- | drivers/staging/vt6655/bssdb.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index d35616d4883d..5ce4ef9c1bd1 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -30,21 +30,10 @@ #ifndef __BSSDB_H__ #define __BSSDB_H__ -//#if !defined(__DEVICE_H__) -//#include "device.h" -//#endif #include <linux/skbuff.h> -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ @@ -103,13 +92,13 @@ typedef enum _NDIS_802_11_NETWORK_TYPE typedef struct tagSERPObject { BOOL bERPExist; BYTE byERP; -} ERPObject, DEF* PERPObject; +}ERPObject, *PERPObject; typedef struct tagSRSNCapObject { BOOL bRSNCapExist; WORD wRSNCap; -} SRSNCapObject, DEF* PSRSNCapObject; +}SRSNCapObject, *PSRSNCapObject; // BSS info(AP) #pragma pack(1) @@ -126,11 +115,12 @@ typedef struct tagKnownBSS { WORD wCapInfo; BYTE abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE byRxRate; + // WORD wATIMWindow; BYTE byRSSIStatCnt; LONG ldBmMAX; LONG ldBmAverage[RSSI_STAT_COUNT]; - LONG ldBmAverRange; + LONG ldBmAverRange; //For any BSSID selection improvment BOOL bSelected; @@ -174,7 +164,7 @@ typedef struct tagKnownBSS { BYTE abyIEs[1024]; // don't move this field !! }__attribute__ ((__packed__)) -KnownBSS , DEF* PKnownBSS; +KnownBSS , *PKnownBSS; //2006-1116-01,<Add> by NomadZhao #pragma pack() @@ -245,7 +235,7 @@ typedef struct tagKnownNodeDB { UINT uTxFail[MAX_RATE+1]; UINT uTimeCount; -} KnownNodeDB, DEF* PKnownNodeDB; +} KnownNodeDB, *PKnownNodeDB; /*--------------------- Export Functions --------------------------*/ @@ -345,6 +335,7 @@ BSSvSecondCallBack( IN HANDLE hDeviceContext ); + VOID BSSvUpdateNodeTxCounter( IN HANDLE hDeviceContext, |