diff options
Diffstat (limited to 'drivers/staging/vt6656/key.h')
-rw-r--r-- | drivers/staging/vt6656/key.h | 62 |
1 files changed, 25 insertions, 37 deletions
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h index b15a64cb386..f749c7a027d 100644 --- a/drivers/staging/vt6656/key.h +++ b/drivers/staging/vt6656/key.h | |||
@@ -58,7 +58,7 @@ | |||
58 | typedef struct tagSKeyItem | 58 | typedef struct tagSKeyItem |
59 | { | 59 | { |
60 | BOOL bKeyValid; | 60 | BOOL bKeyValid; |
61 | ULONG uKeyLength; | 61 | unsigned long uKeyLength; |
62 | BYTE abyKey[MAX_KEY_LEN]; | 62 | BYTE abyKey[MAX_KEY_LEN]; |
63 | QWORD KeyRSC; | 63 | QWORD KeyRSC; |
64 | DWORD dwTSC47_16; | 64 | DWORD dwTSC47_16; |
@@ -66,12 +66,12 @@ typedef struct tagSKeyItem | |||
66 | BYTE byCipherSuite; | 66 | BYTE byCipherSuite; |
67 | BYTE byReserved0; | 67 | BYTE byReserved0; |
68 | DWORD dwKeyIndex; | 68 | DWORD dwKeyIndex; |
69 | PVOID pvKeyTable; | 69 | void *pvKeyTable; |
70 | } SKeyItem, *PSKeyItem; //64 | 70 | } SKeyItem, *PSKeyItem; //64 |
71 | 71 | ||
72 | typedef struct tagSKeyTable | 72 | typedef struct tagSKeyTable |
73 | { | 73 | { |
74 | BYTE abyBSSID[U_ETHER_ADDR_LEN]; //6 | 74 | BYTE abyBSSID[ETH_ALEN]; /* 6 */ |
75 | BYTE byReserved0[2]; //8 | 75 | BYTE byReserved0[2]; //8 |
76 | SKeyItem PairwiseKey; | 76 | SKeyItem PairwiseKey; |
77 | SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 | 77 | SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 |
@@ -97,81 +97,69 @@ typedef struct tagSKeyManagement | |||
97 | 97 | ||
98 | /*--------------------- Export Functions --------------------------*/ | 98 | /*--------------------- Export Functions --------------------------*/ |
99 | 99 | ||
100 | VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable); | 100 | void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable); |
101 | 101 | ||
102 | BOOL KeybGetKey( | 102 | BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex, |
103 | IN PSKeyManagement pTable, | 103 | PSKeyItem *pKey); |
104 | IN PBYTE pbyBSSID, | ||
105 | IN DWORD dwKeyIndex, | ||
106 | OUT PSKeyItem *pKey | ||
107 | ); | ||
108 | 104 | ||
109 | BOOL KeybSetKey( | 105 | BOOL KeybSetKey( |
110 | PVOID pDeviceHandler, | 106 | void *pDeviceHandler, |
111 | PSKeyManagement pTable, | 107 | PSKeyManagement pTable, |
112 | PBYTE pbyBSSID, | 108 | PBYTE pbyBSSID, |
113 | DWORD dwKeyIndex, | 109 | DWORD dwKeyIndex, |
114 | ULONG uKeyLength, | 110 | unsigned long uKeyLength, |
115 | PQWORD pKeyRSC, | 111 | PQWORD pKeyRSC, |
116 | PBYTE pbyKey, | 112 | PBYTE pbyKey, |
117 | BYTE byKeyDecMode | 113 | BYTE byKeyDecMode |
118 | ); | 114 | ); |
119 | 115 | ||
120 | BOOL KeybRemoveKey( | 116 | BOOL KeybRemoveKey( |
121 | PVOID pDeviceHandler, | 117 | void *pDeviceHandler, |
122 | PSKeyManagement pTable, | 118 | PSKeyManagement pTable, |
123 | PBYTE pbyBSSID, | 119 | PBYTE pbyBSSID, |
124 | DWORD dwKeyIndex | 120 | DWORD dwKeyIndex |
125 | ); | 121 | ); |
126 | 122 | ||
127 | BOOL KeybRemoveAllKey ( | 123 | BOOL KeybRemoveAllKey( |
128 | PVOID pDeviceHandler, | 124 | void *pDeviceHandler, |
129 | PSKeyManagement pTable, | 125 | PSKeyManagement pTable, |
130 | PBYTE pbyBSSID | 126 | PBYTE pbyBSSID |
131 | ); | 127 | ); |
132 | 128 | ||
133 | VOID KeyvRemoveWEPKey( | 129 | void KeyvRemoveWEPKey( |
134 | PVOID pDeviceHandler, | 130 | void *pDeviceHandler, |
135 | PSKeyManagement pTable, | 131 | PSKeyManagement pTable, |
136 | DWORD dwKeyIndex | 132 | DWORD dwKeyIndex |
137 | ); | 133 | ); |
138 | 134 | ||
139 | VOID KeyvRemoveAllWEPKey( | 135 | void KeyvRemoveAllWEPKey( |
140 | PVOID pDeviceHandler, | 136 | void *pDeviceHandler, |
141 | PSKeyManagement pTable | 137 | PSKeyManagement pTable |
142 | ); | 138 | ); |
143 | 139 | ||
144 | BOOL KeybGetTransmitKey( | 140 | BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType, |
145 | IN PSKeyManagement pTable, | 141 | PSKeyItem *pKey); |
146 | IN PBYTE pbyBSSID, | ||
147 | IN DWORD dwKeyType, | ||
148 | OUT PSKeyItem *pKey | ||
149 | ); | ||
150 | 142 | ||
151 | BOOL KeybCheckPairewiseKey( | 143 | BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey); |
152 | IN PSKeyManagement pTable, | ||
153 | OUT PSKeyItem *pKey | ||
154 | ); | ||
155 | 144 | ||
156 | BOOL KeybSetDefaultKey ( | 145 | BOOL KeybSetDefaultKey( |
157 | PVOID pDeviceHandler, | 146 | void *pDeviceHandler, |
158 | PSKeyManagement pTable, | 147 | PSKeyManagement pTable, |
159 | DWORD dwKeyIndex, | 148 | DWORD dwKeyIndex, |
160 | ULONG uKeyLength, | 149 | unsigned long uKeyLength, |
161 | PQWORD pKeyRSC, | 150 | PQWORD pKeyRSC, |
162 | PBYTE pbyKey, | 151 | PBYTE pbyKey, |
163 | BYTE byKeyDecMode | 152 | BYTE byKeyDecMode |
164 | ); | 153 | ); |
165 | 154 | ||
166 | BOOL KeybSetAllGroupKey ( | 155 | BOOL KeybSetAllGroupKey( |
167 | PVOID pDeviceHandler, | 156 | void *pDeviceHandler, |
168 | PSKeyManagement pTable, | 157 | PSKeyManagement pTable, |
169 | DWORD dwKeyIndex, | 158 | DWORD dwKeyIndex, |
170 | ULONG uKeyLength, | 159 | unsigned long uKeyLength, |
171 | PQWORD pKeyRSC, | 160 | PQWORD pKeyRSC, |
172 | PBYTE pbyKey, | 161 | PBYTE pbyKey, |
173 | BYTE byKeyDecMode | 162 | BYTE byKeyDecMode |
174 | ); | 163 | ); |
175 | 164 | ||
176 | #endif // __KEY_H__ | 165 | #endif /* __KEY_H__ */ |
177 | |||