diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h b/drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h new file mode 100644 index 0000000..87048b3 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h @@ -0,0 +1,30 @@ +#ifndef __RTL8712_RATECTRL_BITDEF_H__ +#define __RTL8712_RATECTRL_BITDEF_H__ + +/*INIRTSMCS_SEL*/ +#define _INIRTSMCS_SEL_MSK 0x3F + +/* RRSR*/ +#define _RRSR_SHORT BIT(23) +#define _RRSR_RSC_MSK 0x600000 +#define _RRSR_RSC_SHT 21 +#define _RRSR_BITMAP_MSK 0x0FFFFF +#define _RRSR_BITMAP_SHT 0 + +/* AGGLEN_LMT_H*/ +#define _AGGLMT_MCS32_MSK 0xF0 +#define _AGGLMT_MCS32_SHT 4 +#define _AGGLMT_MCS15_SGI_MSK 0x0F +#define _AGGLMT_MCS15_SGI_SHT 0 + +/* DARFRC*/ +/* RARFRC*/ +/* MCS_TXAGC*/ +/* CCK_TXAGC*/ +#define _CCK_MSK 0xFF00 +#define _CCK_SHT 8 +#define _BARKER_MSK 0x00FF +#define _BARKER_SHT 0 + +#endif /* __RTL8712_RATECTRL_BITDEF_H__*/ + |