diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/staging/winbond/ds_tkip.h | |
parent | integrity: remove __setup auditing msgs (diff) | |
parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
download | linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.zip |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/winbond/ds_tkip.h')
-rw-r--r-- | drivers/staging/winbond/ds_tkip.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/staging/winbond/ds_tkip.h b/drivers/staging/winbond/ds_tkip.h deleted file mode 100644 index 9c5c4e73f2c2..000000000000 --- a/drivers/staging/winbond/ds_tkip.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __WINBOND_DS_TKIP_H -#define __WINBOND_DS_TKIP_H - -#include <linux/types.h> - -// Rotation functions on 32 bit values -#define ROL32( A, n ) \ - ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) ) - -#define ROR32( A, n ) ROL32( (A), 32-(n) ) - - -typedef struct tkip -{ - u32 K0, K1; // Key - union - { - struct // Current state - { - u32 L; - u32 R; - }; - u8 LR[8]; - }; - union - { - u32 M; // Message accumulator (single word) - u8 Mb[4]; - }; - s32 bytes_in_M; // # bytes in M -} tkip_t; - -//void _append_data( u8 *pData, u16 size, tkip_t *p ); -void Mds_MicGet( void* adapter, void* pRxLayer1, u8 *pKey, u8 *pMic ); -void Mds_MicFill( void* adapter, void* pDes, u8 *XmitBufAddress ); - -#endif |