Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[cascardo/linux.git] / drivers / staging / rtl8192e / ieee80211 / rtl819x_HT.h

diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
index 992b718..f968817 100644 (file)
--- 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_