diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-24 17:48:22 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-24 17:48:22 +1000 |
commit | 927fa4bac53a5e8520867007d9d2df4fa8fb2e54 (patch) | |
tree | d4b3995d0b08eb54352d34837d1da809b5ae2548 /drivers/staging/vt6655/key.h | |
parent | 8f10ec3642fbb15dcd7701d49123a1a1a26d2129 (diff) | |
parent | 0b1167a7f7616ce9375959ae42be56e919c429ca (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/vt6655/key.h')
-rw-r--r-- | drivers/staging/vt6655/key.h | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index 9c7d335ea088..ba797c7b3c17 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -27,21 +27,12 @@ * */ - #ifndef __KEY_H__ #define __KEY_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - -#if !defined(__TETHER_H__) #include "tether.h" -#endif - -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif /*--------------------- Export Definitions -------------------------*/ #define MAX_GROUP_KEY 4 @@ -76,7 +67,7 @@ typedef struct tagSKeyItem BYTE byReserved0; DWORD dwKeyIndex; PVOID pvKeyTable; -} SKeyItem, DEF* PSKeyItem; //64 +} SKeyItem, *PSKeyItem; //64 typedef struct tagSKeyTable { @@ -93,12 +84,12 @@ typedef struct tagSKeyTable WORD wKeyCtl; // for address of wKeyCtl at align 4 BYTE byReserved1[6]; -} SKeyTable, DEF* PSKeyTable; //348 +} SKeyTable, *PSKeyTable; //348 typedef struct tagSKeyManagement { SKeyTable KeyTable[MAX_KEY_TABLE]; -} SKeyManagement, DEF* PSKeyManagement; +} SKeyManagement, * PSKeyManagement; /*--------------------- Export Types ------------------------------*/ @@ -109,9 +100,6 @@ typedef struct tagSKeyManagement /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); @@ -192,11 +180,5 @@ BOOL KeybSetAllGroupKey ( BYTE byLocalID ); -#ifdef __cplusplus -} /* End of extern "C" { */ - -#endif /* __cplusplus */ - - #endif // __KEY_H__ |