1 files changed, 48 insertions, 6 deletions

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index d3c3ffd3898..713c7ddba8e 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -165,6 +165,12 @@ enum hardware_type {
 #define IS_HARDWARE_TYPE_8723U(rtlhal)                  \
         (rtlhal->hw_type == HARDWARE_TYPE_RTL8723U)
 
+#define RX_HAL_IS_CCK_RATE(_pdesc)\
+        (_pdesc->rxmcs == DESC92_RATE1M ||              \
+         _pdesc->rxmcs == DESC92_RATE2M ||              \
+         _pdesc->rxmcs == DESC92_RATE5_5M ||            \
+         _pdesc->rxmcs == DESC92_RATE11M)
+
 enum scan_operation_backup_opt {
         SCAN_OPT_BACKUP = 0,
         SCAN_OPT_RESTORE,
@@ -386,6 +392,41 @@ enum rtl_hal_state {
         _HAL_STATE_START = 1,
 };
 
+enum rtl_desc92_rate {
+        DESC92_RATE1M = 0x00,
+        DESC92_RATE2M = 0x01,
+        DESC92_RATE5_5M = 0x02,
+        DESC92_RATE11M = 0x03,
+
+        DESC92_RATE6M = 0x04,
+        DESC92_RATE9M = 0x05,
+        DESC92_RATE12M = 0x06,
+        DESC92_RATE18M = 0x07,
+        DESC92_RATE24M = 0x08,
+        DESC92_RATE36M = 0x09,
+        DESC92_RATE48M = 0x0a,
+        DESC92_RATE54M = 0x0b,
+
+        DESC92_RATEMCS0 = 0x0c,
+        DESC92_RATEMCS1 = 0x0d,
+        DESC92_RATEMCS2 = 0x0e,
+        DESC92_RATEMCS3 = 0x0f,
+        DESC92_RATEMCS4 = 0x10,
+        DESC92_RATEMCS5 = 0x11,
+        DESC92_RATEMCS6 = 0x12,
+        DESC92_RATEMCS7 = 0x13,
+        DESC92_RATEMCS8 = 0x14,
+        DESC92_RATEMCS9 = 0x15,
+        DESC92_RATEMCS10 = 0x16,
+        DESC92_RATEMCS11 = 0x17,
+        DESC92_RATEMCS12 = 0x18,
+        DESC92_RATEMCS13 = 0x19,
+        DESC92_RATEMCS14 = 0x1a,
+        DESC92_RATEMCS15 = 0x1b,
+        DESC92_RATEMCS15_SG = 0x1c,
+        DESC92_RATEMCS32 = 0x20,
+};
+
 enum rtl_var_map {
         /*reg map */
         SYS_ISO_CTRL = 0,
@@ -409,6 +450,7 @@ enum rtl_var_map {
         EFUSE_HWSET_MAX_SIZE,
         EFUSE_MAX_SECTION_MAP,
         EFUSE_REAL_CONTENT_SIZE,
+        EFUSE_OOB_PROTECT_BYTES_LEN,
 
         /*CAM map */
         RWCAM,
@@ -901,16 +943,12 @@ struct rtl_io {
         unsigned long pci_base_addr;    /*device I/O address */
 
         void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);
-        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);
-        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);
-        int (*writeN_async) (struct rtl_priv *rtlpriv, u32 addr, u16 len,
-                             u8 *pdata);
+        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, __le16 val);
+        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, __le32 val);
 
         u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);
         u16(*read16_sync) (struct rtl_priv *rtlpriv, u32 addr);
         u32(*read32_sync) (struct rtl_priv *rtlpriv, u32 addr);
-        int (*readN_sync) (struct rtl_priv *rtlpriv, u32 addr, u16 len,
-                            u8 *pdata);
 
 };
 
@@ -1287,6 +1325,7 @@ struct rtl_stats {
         s8 rx_mimo_signalquality[2];
         bool packet_matchbssid;
         bool is_cck;
+        bool is_ht;
         bool packet_toself;
         bool packet_beacon;     /*for rssi */
         char cck_adc_pwdb[4];   /*for rx path selection */
@@ -1448,6 +1487,9 @@ struct rtl_mod_params {
         /* default: 0 = using hardware encryption */
         int sw_crypto;
 
+        /* default: 0 = DBG_EMERG (0)*/
+        int debug;
+
         /* default: 1 = using no linked power save */
         bool inactiveps;