diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index d6fb55e..ba86e41 100644
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -121,13 +121,11 @@ static void rtl8188eu_interface_configure(_adapter *padapter)
 	pHalData->UsbTxAggMode		= 1;
 	pHalData->UsbTxAggDescNum	= 0x6;	/*  only 4 bits */
 
-#ifdef CONFIG_USB_RX_AGGREGATION
 	pHalData->UsbRxAggMode		= USB_RX_AGG_DMA;/*  USB_RX_AGG_DMA; */
 	pHalData->UsbRxAggBlockCount	= 8; /* unit : 512b */
 	pHalData->UsbRxAggBlockTimeout	= 0x6;
 	pHalData->UsbRxAggPageCount	= 48; /* uint :128 b 0x0A;	10 = MAX_RX_DMA_BUFFER_SIZE/2/pHalData->UsbBulkOutSize */
 	pHalData->UsbRxAggPageTimeout	= 0x4; /* 6, absolute time = 34ms/(2^6) */
-#endif
 
 	HalUsbSetQueuePipeMapping8188EUsb(padapter,
 				pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
@@ -813,7 +811,6 @@ usb_AggSettingRxUpdate(
 		PADAPTER			Adapter
 	)
 {
-#ifdef CONFIG_USB_RX_AGGREGATION
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
 	u8			valueDMA;
 	u8			valueUSB;
@@ -889,7 +886,6 @@ usb_AggSettingRxUpdate(
 		default:
 			break;
 	}
-#endif
 }	/*  usb_AggSettingRxUpdate */
 
 static void
@@ -2861,7 +2857,6 @@ _func_enter_;
 			}
 			break;
 		case HW_VAR_RXDMA_AGG_PG_TH:
-			#ifdef CONFIG_USB_RX_AGGREGATION
 			{
 				u8	threshold = *((u8 *)val);
 				if ( threshold == 0)
@@ -2870,7 +2865,6 @@ _func_enter_;
 				}
 				rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold);
 			}
-			#endif
 			break;
 		case HW_VAR_SET_RPWM:
 #ifdef CONFIG_LPS_LCLK
diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 5ac3ce7..7d7a053 100644
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -653,21 +653,18 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
 
 		recvframe_put(precvframe, skb_len);
 
-#ifdef CONFIG_USB_RX_AGGREGATION
-		switch (pHalData->UsbRxAggMode)
-		{
-			case USB_RX_AGG_DMA:
-			case USB_RX_AGG_MIX:
-				pkt_offset = (u16)_RND128(pkt_offset);
-				break;
-				case USB_RX_AGG_USB:
-				pkt_offset = (u16)_RND4(pkt_offset);
-				break;
-			case USB_RX_AGG_DISABLE:
-			default:
-				break;
+		switch (pHalData->UsbRxAggMode) {
+		case USB_RX_AGG_DMA:
+		case USB_RX_AGG_MIX:
+			pkt_offset = (u16)_RND128(pkt_offset);
+			break;
+			case USB_RX_AGG_USB:
+			pkt_offset = (u16)_RND4(pkt_offset);
+			break;
+		case USB_RX_AGG_DISABLE:
+		default:
+			break;
 		}
-#endif
 
 		if (pattrib->pkt_rpt_type == NORMAL_RX)/* Normal rx packet */
 		{
diff --git a/include/autoconf.h b/include/autoconf.h
index ffc17ec..9899da9 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -85,8 +85,6 @@
  * Interface  Related Config
  */
 
-#define CONFIG_USB_RX_AGGREGATION
-
 #define CONFIG_PREALLOC_RECV_SKB
 
 /*
@@ -123,7 +121,6 @@
 #ifdef CONFIG_MP_INCLUDED
 	#define MP_DRIVER 1
 	#define CONFIG_MP_IWPRIV_SUPPORT
-	//#undef CONFIG_USB_RX_AGGREGATION
 #else
 	#define MP_DRIVER 0
 #endif
diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h
index 443f78f..7a52b3d 100644
--- a/include/rtl8188e_hal.h
+++ b/include/rtl8188e_hal.h
@@ -142,8 +142,6 @@ typedef struct _RT_8188E_FIRMWARE_HDR
 #define DRIVER_EARLY_INT_TIME		0x05
 #define BCN_DMA_ATIME_INT_TIME		0x02
 
-#ifdef CONFIG_USB_RX_AGGREGATION
-
 typedef enum _USB_RX_AGG_MODE{
 	USB_RX_AGG_DISABLE,
 	USB_RX_AGG_DMA,
@@ -151,11 +149,6 @@ typedef enum _USB_RX_AGG_MODE{
 	USB_RX_AGG_MIX
 }USB_RX_AGG_MODE;
 
-//#define MAX_RX_DMA_BUFFER_SIZE	10240		// 10K for 8192C RX DMA buffer
-
-#endif
-
-
 #define MAX_RX_DMA_BUFFER_SIZE_88E	      0x2400 //9k for 88E nornal chip , //MaxRxBuff=10k-max(TxReportSize(64*8), WOLPattern(16*24))
 
 #define MAX_TX_REPORT_BUFFER_SIZE			0x0400 // 1k
@@ -481,7 +474,6 @@ typedef struct hal_data_8188e
 	u8	C2hArray[16];
 	u8	UsbTxAggMode;
 	u8	UsbTxAggDescNum;
-#ifdef CONFIG_USB_RX_AGGREGATION
 	u16	HwRxPageSize;				// Hardware setting
 	u32	MaxUsbRxAggBlock;
 
@@ -490,7 +482,6 @@ typedef struct hal_data_8188e
 	u8	UsbRxAggBlockTimeout;
 	u8	UsbRxAggPageCount;			// 8192C DMA page count
 	u8	UsbRxAggPageTimeout;
-#endif
 
 #ifdef CONFIG_TX_EARLY_MODE
 	u8			bEarlyModeEnable;