staging: r8188eu: hal_data_8188e cleanups
cover staging: r8188eu: hal_data_8188e cleanups
This set removes some variables from the hal_data_8188e structure.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (9):
staging: r8188eu: ExternalPA is read-only
staging: r8188eu: remove PGMaxGroup from struct hal_data_8188e
staging: r8188eu: remove ReceiveConfig from struct hal_data_8188e
staging: r8188eu: BasicRateSet is set but never used
staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e
staging: r8188eu: remove UsbTxAggMode from struct hal_data_8188e
staging: r8188eu: remove UsbRxAggMode from struct hal_data_8188e
staging: r8188eu: remove UsbRxAggBlock* from struct hal_data_8188e
staging: r8188eu: remove UsbRxAggPage* from struct hal_data_8188e
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 5 +- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 86 ++++--------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 26 +----- .../staging/r8188eu/include/rtl8188e_xmit.h | 2 + 6 files changed, 26 insertions(+), 109 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/9 staging: r8188eu: ExternalPA is read-only
The variable ExternalPA in struct hal_data_8188e is never set. It stays at the default value 0. Remove it and remove related dead code.
--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 3 --- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +0 -3
@@ -99,9 +99,6 @@ rtl8188e_PHY_RF6052SetCckTxPower( TxAGC[idx1] = pPowerlevel[idx1] | (pPowerlevel[idx1] <<8 ) | (pPowerlevel[idx1] <<16 ) | (pPowerlevel[idx1] <<24 ); -/* 2010/10/18 MH For external PA module. We need to limit power index to be less than 0x20. */ -if (TxAGC[idx1] >0x20 && pHalData->ExternalPA) - TxAGC[idx1] =0x20 ; } }else {for (idx1 =RF_PATH_A ; idx1 <=RF_PATH_B ; idx1++) {
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -181,7 +181,6 @@ struct hal_data_8188e {u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP ][16 ];u8 CrystalCap; -u8 ExternalPA;u32 AcParam_BE;/* Original parameter for BE, use for EDCA turbo. */
Signature · 1 line
2.34.1
PATCH 2/9 staging: r8188eu: remove PGMaxGroup from struct hal_data_8188e
In reply to Michael Straubethe variable PGMaxGroup in struct hal_data_8188e is set to 13 and never changed. We can use the already defined constant MAX_PG_GROUP, which is 13, and remove PGMaxGroup from struct hal_data_8188e.
--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +1 -1
@@ -200,7 +200,7 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,/* increase power diff defined by Realtek for regulatory */ if (pHalData->pwrGroupCnt ==1 ) chnlGroup =0 ; -if (pHalData->pwrGroupCnt >= pHalData->PGMaxGroup) { +if (pHalData->pwrGroupCnt >=MAX_PG_GROUP ) {if (Channel <3 )/* Channel 1-2 */ chnlGroup =0 ;else if (Channel <6 )/* Channel 3-5 */
drivers/staging/r8188eu/hal/usb_halinit.c +0 -1
@@ -1738,7 +1738,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt) haldata->odmpriv.RFCalibrateInfo.bIQKInitialized = false; haldata->odmpriv.RFCalibrateInfo.TM_Trigger =0 ;/* for IQK */ haldata->pwrGroupCnt =0 ; - haldata->PGMaxGroup =13 ; haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP_index =0 ;for (i =0 ; i <HP_THERMAL_NUM ; i++) haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] =0 ;
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -150,7 +150,6 @@ struct txpowerinfo24g {struct hal_data_8188e {struct HAL_VERSION VersionID; -u8 PGMaxGroup;/* current WIFI_PHY values */ u32 ReceiveConfig;enum ht_channel_width CurrentChannelBW;
Signature · 1 line
2.34.1
PATCH 3/9 staging: r8188eu: remove ReceiveConfig from struct hal_data_8188e
In reply to Michael StraubeThe ReceiveConfig variable in struct hal_data_8188e is only used to store a local value. Use a local variable instead and remove ReceiveConfig from struct hal_data_8188e.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 12 +++++------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +5 -7
@@ -324,15 +324,13 @@ static void _InitDriverInfoSize(struct adapter *Adapter, u8 drvInfoSize)static void _InitWMACSetting (struct adapter *Adapter) { -struct hal_data_8188e *haldata = &Adapter->haldata; - - haldata->ReceiveConfig =RCR_AAP |RCR_APM |RCR_AM |RCR_AB | -RCR_CBSSID_DATA |RCR_CBSSID_BCN | -RCR_APP_ICV |RCR_AMF |RCR_HTC_LOC_CTRL | -RCR_APP_MIC |RCR_APP_PHYSTS ; +u32 receive_config =RCR_AAP |RCR_APM |RCR_AM |RCR_AB | +RCR_CBSSID_DATA |RCR_CBSSID_BCN | +RCR_APP_ICV |RCR_AMF |RCR_HTC_LOC_CTRL | +RCR_APP_MIC |RCR_APP_PHYSTS ;/* some REG_RCR will be modified later by phy_ConfigMACWithHeaderFile() */ -rtw_write32 (Adapter,REG_RCR , haldata->ReceiveConfig); +rtw_write32 (Adapter,REG_RCR , receive_config);/* Accept all multicast address */ rtw_write32 (Adapter,REG_MAR ,0xFFFFFFFF );
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -151,7 +151,6 @@ struct txpowerinfo24g {struct hal_data_8188e {struct HAL_VERSION VersionID;/* current WIFI_PHY values */ -u32 ReceiveConfig;enum ht_channel_width CurrentChannelBW;u8 CurrentChannel;u8 nCur40MhzPrimeSC;/* Control channel sub-carrier */
Signature · 1 line
2.34.1
PATCH 4/9 staging: r8188eu: BasicRateSet is set but never used
In reply to Michael StraubeThe varaible BasicRateSet in struct hal_data_8188e is set but never used. Remove it.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 -- 2 files changed, 3 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -1
@@ -1078,7 +1078,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)/* CCK 5.5M & 11M ACK should be enabled for better performance */ BrateCfg = (BrateCfg |0xd ) &0x15d ; - haldata->BasicRateSet = BrateCfg; BrateCfg |=0x01 ;/* default enable 1M ACK rate */ /* Set RRSR rate table. */
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -2
@@ -155,8 +155,6 @@ struct hal_data_8188e {u8 CurrentChannel;u8 nCur40MhzPrimeSC;/* Control channel sub-carrier */ -u16 BasicRateSet; -u8 EEPROMRegulatory;u8 EEPROMThermalMeter;
Signature · 1 line
2.34.1
PATCH 5/9 staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e
In reply to Michael StraubeUsbTxAggDescNum in struct hal_data_8188e is set to 0x6 and never changed. Define this constant and remove UsbTxAggDescNum from the hal_data_8188e structure.
--- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpif (pbuf < bulkptr) { desc_cnt++; -if (desc_cnt == haldata->UsbTxAggDescNum) +if (desc_cnt ==USB_TXAGG_DESC_NUM )break ; }else { desc_cnt =0 ;
drivers/staging/r8188eu/hal/usb_halinit.c +1 -2
@@ -54,7 +54,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ haldata->UsbTxAggMode =1 ; - haldata->UsbTxAggDescNum =0x6 ;/* only 4 bits */ haldata->UsbRxAggMode =USB_RX_AGG_DMA ;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =8 ;/* unit : 512b */
@@ -416,7 +415,7 @@ static void usb_AggSettingTxUpdate(struct adapter *Adapter)if (haldata->UsbTxAggMode) { value32 =rtw_read32 (Adapter,REG_TDECTRL ); value32 = value32 & ~(BLK_DESC_NUM_MASK <<BLK_DESC_NUM_SHIFT ); - value32 |= ((haldata->UsbTxAggDescNum &BLK_DESC_NUM_MASK ) <<BLK_DESC_NUM_SHIFT ); + value32 |= ((USB_TXAGG_DESC_NUM &BLK_DESC_NUM_MASK ) <<BLK_DESC_NUM_SHIFT );rtw_write32 (Adapter,REG_TDECTRL , value32); }
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -214,7 +214,6 @@ struct hal_data_8188e {u32 UsbBulkOutSize;u8 UsbTxAggMode; -u8 UsbTxAggDescNum;enum usb_rx_agg_mode UsbRxAggMode;u8 UsbRxAggBlockCount;/* USB Block count. Block size is
drivers/staging/r8188eu/include/rtl8188e_xmit.h +2 -0
@@ -93,6 +93,8 @@ enum TXDESC_SC {#define SGI BIT(6)#define USB_TXAGG_NUM_SHT 24 +#define USB_TXAGG_DESC_NUM 0x6 +#define txdesc_set_ccx_sw_88e (txdesc, value) \ do { \ ((struct txdesc_88e *)(txdesc))->sw1 = (((value)>>8) & 0x0f); \
Signature · 1 line
2.34.1
PATCH 6/9 staging: r8188eu: remove UsbTxAggMode from struct hal_data_8188e
In reply to Michael StraubeUsbTxAggMode in struct hal_data_r8188e is only used in a single if statement. Remove UsbTxAggMode from the hal_data_8188e structure and adjust the if statement.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 17 ++++++----------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +6 -11
@@ -53,8 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)else haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ - haldata->UsbTxAggMode =1 ; - haldata->UsbRxAggMode =USB_RX_AGG_DMA ;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =8 ;/* unit : 512b */ haldata->UsbRxAggBlockTimeout =0x6 ;
@@ -406,20 +404,17 @@ static void _InitRetryFunction(struct adapter *Adapter)*---------------------------------------------------------------------------*/ static void usb_AggSettingTxUpdate (struct adapter *Adapter) { -struct hal_data_8188e *haldata = &Adapter->haldata;u32 value32;if (Adapter->registrypriv.wifi_spec) - haldata->UsbTxAggMode = false; +return ; -if (haldata->UsbTxAggMode) { - value32 =rtw_read32 (Adapter,REG_TDECTRL ); - value32 = value32 & ~(BLK_DESC_NUM_MASK <<BLK_DESC_NUM_SHIFT ); - value32 |= ((USB_TXAGG_DESC_NUM &BLK_DESC_NUM_MASK ) <<BLK_DESC_NUM_SHIFT ); + value32 =rtw_read32 (Adapter,REG_TDECTRL ); + value32 = value32 & ~(BLK_DESC_NUM_MASK <<BLK_DESC_NUM_SHIFT ); + value32 |= ((USB_TXAGG_DESC_NUM &BLK_DESC_NUM_MASK ) <<BLK_DESC_NUM_SHIFT ); -rtw_write32 (Adapter,REG_TDECTRL , value32); - } -}/* usb_AggSettingTxUpdate */ +rtw_write32 (Adapter,REG_TDECTRL , value32); +}/*----------------------------------------------------------------------------- * Function: usb_AggSettingRxUpdate()
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -2
@@ -213,8 +213,6 @@ struct hal_data_8188e {u32 UsbBulkOutSize; -u8 UsbTxAggMode; -enum usb_rx_agg_mode UsbRxAggMode;u8 UsbRxAggBlockCount;/* USB Block count. Block size is * 512-byte in high speed and 64-byte
Signature · 1 line
2.34.1
PATCH 7/9 staging: r8188eu: remove UsbRxAggMode from struct hal_data_8188e
In reply to Michael StraubeUsbRxAggMode in struct hal_data_8188e is set to USB_RX_AGG_DMA and never changed. Remove UsbRxAggMode from the hal_data_8188e structure and remove related dead code.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 46 ++----------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 +----- .../staging/r8188eu/include/rtl8188e_hal.h | 8 ---- 3 files changed, 7 insertions(+), 61 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +5 -41
@@ -53,7 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)else haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ - haldata->UsbRxAggMode =USB_RX_AGG_DMA ;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =8 ;/* unit : 512b */ haldata->UsbRxAggBlockTimeout =0x6 ; haldata->UsbRxAggPageCount =48 ;/* uint :128 b 0x0A; 10 = MAX_RX_DMA_BUFFER_SIZE/2/haldata->UsbBulkOutSize */
@@ -443,50 +442,15 @@ usb_AggSettingRxUpdate( valueDMA =rtw_read8 (Adapter,REG_TRXDMA_CTRL ); valueUSB =rtw_read8 (Adapter,REG_USB_SPECIAL_OPTION ); -switch (haldata->UsbRxAggMode) { -case USB_RX_AGG_DMA : - valueDMA |=RXDMA_AGG_EN ; - valueUSB &= ~USB_AGG_EN ; -break ; -case USB_RX_AGG_USB : - valueDMA &= ~RXDMA_AGG_EN ; - valueUSB |=USB_AGG_EN ; -break ; -case USB_RX_AGG_MIX : - valueDMA |=RXDMA_AGG_EN ; - valueUSB |=USB_AGG_EN ; -break ; -case USB_RX_AGG_DISABLE : -default : - valueDMA &= ~RXDMA_AGG_EN ; - valueUSB &= ~USB_AGG_EN ; -break ; - } + valueDMA |=RXDMA_AGG_EN ; + valueUSB &= ~USB_AGG_EN ;rtw_write8 (Adapter,REG_TRXDMA_CTRL , valueDMA);rtw_write8 (Adapter,REG_USB_SPECIAL_OPTION , valueUSB); -switch (haldata->UsbRxAggMode) { -case USB_RX_AGG_DMA : -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , haldata->UsbRxAggPageTimeout); -break ; -case USB_RX_AGG_USB : -rtw_write8 (Adapter,REG_USB_AGG_TH , haldata->UsbRxAggBlockCount); -rtw_write8 (Adapter,REG_USB_AGG_TO , haldata->UsbRxAggBlockTimeout); -break ; -case USB_RX_AGG_MIX : -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , (haldata->UsbRxAggPageTimeout &0x1F ));/* 0x280[12:8] */ -rtw_write8 (Adapter,REG_USB_AGG_TH , haldata->UsbRxAggBlockCount); -rtw_write8 (Adapter,REG_USB_AGG_TO , haldata->UsbRxAggBlockTimeout); -break ; -case USB_RX_AGG_DISABLE : -default : -/* TODO: */ -break ; - } -}/* usb_AggSettingRxUpdate */ +rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); +rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , haldata->UsbRxAggPageTimeout); +}static void InitUsbAggregationSetting (struct adapter *Adapter) {
drivers/staging/r8188eu/hal/usb_ops_linux.c +2 -12
@@ -295,18 +295,8 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)recvframe_put (precvframe, skb_len); -switch (haldata->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 ; - } + pkt_offset = (u16 )_RND128 (pkt_offset); +if (pattrib->pkt_rpt_type ==NORMAL_RX ) {/* Normal rx packet */ if (pattrib->physt)update_recvframe_phyinfo_88e (precvframe, (struct phy_stat *)pphy_status);
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -8
@@ -72,13 +72,6 @@ struct rt_firmware_hdr {#define DRIVER_EARLY_INT_TIME 0x05#define BCN_DMA_ATIME_INT_TIME 0x02 -enum usb_rx_agg_mode { -USB_RX_AGG_DISABLE , -USB_RX_AGG_DMA , -USB_RX_AGG_USB , -USB_RX_AGG_MIX -}; -#define MAX_RX_DMA_BUFFER_SIZE_88E \ 0x2400/* 9k for 88E nornal chip , MaxRxBuff=10k-max(TxReportSize(64*8), * WOLPattern(16*24)) */
@@ -213,7 +206,6 @@ struct hal_data_8188e {u32 UsbBulkOutSize; -enum usb_rx_agg_mode UsbRxAggMode;u8 UsbRxAggBlockCount;/* USB Block count. Block size is * 512-byte in high speed and 64-byte * in full speed */
Signature · 1 line
2.34.1
PATCH 8/9 staging: r8188eu: remove UsbRxAggBlock* from struct hal_data_8188e
In reply to Michael StraubeUsbRxAggBlockCount and UsbRxAggBlockTimeout in struct hal_data_8188e are set but not used. Remove them.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/rtl8188e_hal.h | 4 ---- 2 files changed, 6 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -2
@@ -53,8 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)else haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ - haldata->UsbRxAggBlockCount =8 ;/* unit : 512b */ - haldata->UsbRxAggBlockTimeout =0x6 ; haldata->UsbRxAggPageCount =48 ;/* uint :128 b 0x0A; 10 = MAX_RX_DMA_BUFFER_SIZE/2/haldata->UsbBulkOutSize */ haldata->UsbRxAggPageTimeout =0x4 ;/* 6, absolute time = 34ms/(2^6) */
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -4
@@ -206,10 +206,6 @@ struct hal_data_8188e {u32 UsbBulkOutSize; -u8 UsbRxAggBlockCount;/* USB Block count. Block size is -* 512-byte in high speed and 64-byte -* in full speed */ -u8 UsbRxAggBlockTimeout;u8 UsbRxAggPageCount;/* 8192C DMA page count */ u8 UsbRxAggPageTimeout; };
Signature · 1 line
2.34.1
PATCH 9/9 staging: r8188eu: remove UsbRxAggPage* from struct hal_data_8188e
In reply to Michael StraubeUsbRxAggPageCount and UsbRxAggPageTimeout in struct hal_data_8188e are set and never changed. Define these constants and remove the variables from the hal_data_8188e structure.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 10 +++------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +3 -7
@@ -53,9 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)else haldata->UsbBulkOutSize =USB_FULL_SPEED_BULK_SIZE ;/* 64 bytes */ - haldata->UsbRxAggPageCount =48 ;/* uint :128 b 0x0A; 10 = MAX_RX_DMA_BUFFER_SIZE/2/haldata->UsbBulkOutSize */ - haldata->UsbRxAggPageTimeout =0x4 ;/* 6, absolute time = 34ms/(2^6) */ -HalUsbSetQueuePipeMapping8188EUsb (adapt, pdvobjpriv->RtNumOutPipes); }
@@ -433,7 +430,6 @@ usb_AggSettingRxUpdate(struct adapter *Adapter ) { -struct hal_data_8188e *haldata = &Adapter->haldata;u8 valueDMA;u8 valueUSB;
@@ -446,8 +442,8 @@ usb_AggSettingRxUpdate(rtw_write8 (Adapter,REG_TRXDMA_CTRL , valueDMA);rtw_write8 (Adapter,REG_USB_SPECIAL_OPTION , valueUSB); -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); -rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , haldata->UsbRxAggPageTimeout); +rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH ,USB_RXAGG_PAGE_COUNT ); +rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 ,USB_RXAGG_PAGE_TIMEOUT ); }static void InitUsbAggregationSetting (struct adapter *Adapter)
@@ -1314,7 +1310,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) {u8 threshold = *((u8 *)val);if (threshold ==0 ) - threshold = haldata->UsbRxAggPageCount; + threshold =USB_RXAGG_PAGE_COUNT ;rtw_write8 (Adapter,REG_RXDMA_AGG_PG_TH , threshold); }break ;
drivers/staging/r8188eu/include/rtl8188e_hal.h +3 -3
@@ -141,6 +141,9 @@ struct txpowerinfo24g {#define EFUSE_PROTECT_BYTES_BANK 16 +#define USB_RXAGG_PAGE_COUNT 48 +#define USB_RXAGG_PAGE_TIMEOUT 0x4 +struct hal_data_8188e {struct HAL_VERSION VersionID;/* current WIFI_PHY values */
@@ -205,9 +208,6 @@ struct hal_data_8188e {u8 bMacPwrCtrlOn;u32 UsbBulkOutSize; - -u8 UsbRxAggPageCount;/* 8192C DMA page count */ -u8 UsbRxAggPageTimeout; };s32 InitLLTTable (struct adapter *padapter,u8 txpktbuf_bndy);
Signature · 1 line
2.34.1