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/rtl8192su/r819xU_HTGen.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/rtl8192su/r819xU_HTGen.h')
| -rw-r--r-- | drivers/staging/rtl8192su/r819xU_HTGen.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/rtl8192su/r819xU_HTGen.h b/drivers/staging/rtl8192su/r819xU_HTGen.h deleted file mode 100644 index 7a60480..0000000 --- a/drivers/staging/rtl8192su/r819xU_HTGen.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// IOT Action for different AP -// -typedef enum _HT_IOT_ACTION{ - HT_IOT_ACT_TX_USE_AMSDU_4K = 0x00000001, - HT_IOT_ACT_TX_USE_AMSDU_8K = 0x00000002, - HT_IOT_ACT_DECLARE_MCS13 = 0x00000004, - HT_IOT_ACT_DISABLE_EDCA_TURBO = 0x00000008, - HT_IOT_ACT_MGNT_USE_CCK_6M = 0x00000010, - HT_IOT_ACT_CDD_FSYNC = 0x00000020, - HT_IOT_ACT_PURE_N_MODE = 0x00000040, - - //LZM ADD 090224 - HT_IOT_ACT_EDCA_BIAS_ON_RX = 0x00004000, - HT_IOT_ACT_HYBRID_AGGREGATION = 0x00010000, - HT_IOT_ACT_AMSDU_ENABLE = 0x00000800, - HT_IOT_ACT_DISABLE_SHORT_GI = 0x00020000, - HT_IOT_ACT_DISABLE_HIGH_POWER = 0x00040000, - HT_IOT_ACT_DISABLE_TX_2SS = 0x00200000, - HT_IOT_ACT_DISABLE_TX_40_MHZ = 0x00080000, -}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; - |
