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/rtl871x_wlan_sme.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
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/rtl871x_wlan_sme.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_wlan_sme.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_wlan_sme.h b/drivers/staging/rtl8712/rtl871x_wlan_sme.h new file mode 100644 index 000000000000..d9733ac6a43a --- /dev/null +++ b/drivers/staging/rtl8712/rtl871x_wlan_sme.h @@ -0,0 +1,22 @@ +#ifndef _RTL871X_WLAN_SME_H_ +#define _RTL871X_WLAN_SME_H_ + +#define MSR_APMODE 0x0C +#define MSR_STAMODE 0x08 +#define MSR_ADHOCMODE 0x04 +#define MSR_NOLINKMODE 0x00 +#define _1M_RATE_ 0 +#define _2M_RATE_ 1 +#define _5M_RATE_ 2 +#define _11M_RATE_ 3 +#define _6M_RATE_ 4 +#define _9M_RATE_ 5 +#define _12M_RATE_ 6 +#define _18M_RATE_ 7 +#define _24M_RATE_ 8 +#define _36M_RATE_ 9 +#define _48M_RATE_ 10 +#define _54M_RATE_ 11 + +#endif + |