diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 17:22:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 17:22:13 +1100 |
| commit | 96aacb269862dbe72b03dad4de23ac2caa1751f6 (patch) | |
| tree | 10dab1a7a31f7d56ec602c8853b51ae1decc5cb1 /drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | |
| parent | 781c0523eb18341194287c70599a01004f9e2366 (diff) | |
| parent | 414993c79ae8a6a3c5fed3ac9f47a72e0f334ef1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h index 992b71825a8b..f968817d073c 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h @@ -458,7 +458,8 @@ typedef enum _HT_IOT_PEER HT_IOT_PEER_RALINK = 3, HT_IOT_PEER_ATHEROS = 4, HT_IOT_PEER_CISCO= 5, - HT_IOT_PEER_MAX = 6 + HT_IOT_PEER_MARVELL=6, + HT_IOT_PEER_MAX = 7 }HT_IOT_PEER_E, *PHTIOT_PEER_E; // @@ -475,6 +476,7 @@ typedef enum _HT_IOT_ACTION{ HT_IOT_ACT_CDD_FSYNC = 0x00000080, HT_IOT_ACT_PURE_N_MODE = 0x00000100, HT_IOT_ACT_FORCED_CTS2SELF = 0x00000200, + HT_IOT_ACT_NULL_DATA_POWER_SAVING = 0x00800000, }HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; #endif //_RTL819XU_HTTYPE_H_ |