Commit b57774cc authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e 



UsbTxAggDescNum in struct hal_data_8188e is set to 0x6 and never
changed. Define this constant and remove UsbTxAggDescNum from the
hal_data_8188e structure.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-6-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2687230c

drivers/staging/r8188eu/hal/rtl8188eu_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp 


		if (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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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); \