From a76a620b5f6261ef74a55be80944909573a6c955 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 24 Feb 2015 09:43:25 -0600
Subject: [PATCH] rtl8188eu: Remove CONFIG_ODM_REFRESH_RAMASK

This parameter is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 hal/rtl8188e_cmd.c |  6 ------
 hal/rtl8188e_dm.c  |  2 --
 hal/usb_halinit.c  | 12 +++---------
 include/autoconf.h |  1 -
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c
index 8ab0dc0..d7cb5bf 100755
--- a/hal/rtl8188e_cmd.c
+++ b/hal/rtl8188e_cmd.c
@@ -212,7 +212,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
 
 	macid = arg&0x1f;
 
-#ifdef CONFIG_ODM_REFRESH_RAMASK
 	raid = (bitmap>>28) & 0x0f;
 	bitmap &=0x0fffffff;
 
@@ -220,8 +219,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
 		bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv, macid, bitmap, rssi_level);
 
 	bitmap |= ((raid<<28)&0xf0000000);
-#endif /* CONFIG_ODM_REFRESH_RAMASK */
-
 
 	init_rate = get_highest_rate_idx(bitmap&0x0fffffff)&0x3f;
 
@@ -230,9 +227,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
 	if (shortGIrate==true)
 		init_rate |= BIT(6);
 
-
-	/* rtw_write8(pAdapter, (REG_INIDATA_RATE_SEL+macid), (u8)init_rate); */
-
 	raid = (bitmap>>28) & 0x0f;
 
 	bitmap &= 0x0fffffff;
diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c
index 68ebb4e..ac90ce2 100755
--- a/hal/rtl8188e_dm.c
+++ b/hal/rtl8188e_dm.c
@@ -209,9 +209,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
 
 	pdmpriv->InitODMFlag = 0
 		| ODM_BB_DIG
-#ifdef CONFIG_ODM_REFRESH_RAMASK
 		| ODM_BB_RA_MASK
-#endif
 		| ODM_BB_DYNAMIC_TXPWR
 		| ODM_BB_FA_CNT
 		| ODM_BB_RSSI_MONITOR
diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index 6646b0a..a244fad 100755
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -3675,15 +3675,9 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
 			break;
 	}
 
-	/* mask &=0x0fffffff; */
-	rate_bitmap = 0x0fffffff;
-#ifdef	CONFIG_ODM_REFRESH_RAMASK
-	{
-		rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level);
-		printk("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
-			__FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap);
-	}
-#endif
+	rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level);
+	pr_info("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
+	        __FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap);
 
 	mask &= rate_bitmap;
 
diff --git a/include/autoconf.h b/include/autoconf.h
index 851b84d..5f82bf8 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -19,7 +19,6 @@
  ******************************************************************************/
 //***** temporarily flag *******
 
-#define CONFIG_ODM_REFRESH_RAMASK
 #define CONFIG_PHY_SETTING_WITH_ODM
 //for FPGA VERIFICATION config
 #define RTL8188E_FPGAtrue_PHY_VERIFICATION 0