Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b36d3bf authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent db283364

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE

EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1



#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0

#EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0

EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0

EXTRA_CFLAGS += -DDISABLE_BB_RF=0

drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c

+0 −8
Original line number Diff line number Diff line
@@ -2237,11 +2237,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * 
#if 1

	/* if xmit available, just xmit it immediately, else just insert it to the wait queue */

	for(i = 0; i < txb->nr_frags; i++) {

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0) ||

#else

		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0) ||

#endif

		(!ieee->check_nic_enough_desc(ieee->dev,queue_index))||\

		     (ieee->queue_stop)) {

			/* insert the skb packet to the wait queue */
@@ -2250,11 +2246,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * 
			 * */

			//printk("error:no descriptor left@queue_index %d, %d, %d\n", queue_index, skb_queue_len(&ieee->skb_waitQ[queue_index]), ieee->check_nic_enough_desc(ieee->dev,queue_index));

			//ieee80211_stop_queue(ieee);

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

			skb_queue_tail(&ieee->skb_drv_aggQ[queue_index], txb->fragments[i]);

#else

			skb_queue_tail(&ieee->skb_waitQ[queue_index], txb->fragments[i]);

#endif

		}else{

			ieee->softmac_data_hard_start_xmit(

					txb->fragments[i],

drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h

+0 −3
Original line number Diff line number Diff line
@@ -324,9 +324,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ 
	u8				RxReorderPendingTime;

	u16				RxReorderDropCounter;



#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

	u8				UsbTxAggrNum;

#endif



	// Add for Broadcom(Linksys) IOT. Joseph

	u8				bIsPeerBcm;

drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ void HTUpdateDefaultSetting(struct ieee80211_device* ieee) 
	pHTInfo->RxReorderWinSize = 64;

	pHTInfo->RxReorderPendingTime = 30;



#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

	pHTInfo->UsbTxAggrNum = 4;

#endif





}

drivers/staging/rtl8192su/r8192U.h

+0 −31
Original line number Diff line number Diff line
@@ -465,30 +465,6 @@ typedef struct _tx_desc_819x_usb { 
}tx_desc_819x_usb, *ptx_desc_819x_usb;

#endif



#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

typedef struct _tx_desc_819x_usb_aggr_subframe {

	//DWORD 0

	u16	PktSize;

	u8	Offset;

	u8	TxFWInfoSize;



	//DWORD 1

	u8	RATid:3;

	u8	DISFB:1;

	u8	USERATE:1;

	u8	MOREFRAG:1;

	u8	NoEnc:1;

	u8	PIFS:1;

	u8	QueueSelect:5;

	u8	NoACM:1;

	u8	Reserved1:2;

	u8	SecCAMID:5;

	u8	SecDescAssign:1;

	u8	SecType:2;

	u8	PacketID:7;

	u8	OWN:1;

}tx_desc_819x_usb_aggr_subframe, *ptx_desc_819x_usb_aggr_subframe;

#endif





#ifdef RTL8192SU
@@ -868,17 +844,10 @@ typedef struct rx_drvinfo_819x_usb{ 
//#define TX_PACKET_SHIFT_BYTES 	  	(USB_HWDESC_HEADER_LEN + sizeof(tx_fwinfo_819x_usb))

#define MAX_FRAGMENT_COUNT		8

#ifdef RTL8192U

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

#define MAX_TRANSMIT_BUFFER_SIZE			32000

#else

#define MAX_TRANSMIT_BUFFER_SIZE			8000

#endif

#else

#define MAX_TRANSMIT_BUFFER_SIZE  	(1600+(MAX_802_11_HEADER_LENGTH+ENCRYPTION_MAX_OVERHEAD)*MAX_FRAGMENT_COUNT)

#endif

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

#define TX_PACKET_DRVAGGR_SUBFRAME_SHIFT_BYTES (sizeof(tx_desc_819x_usb_aggr_subframe) + sizeof(tx_fwinfo_819x_usb))

#endif

#define scrclng					4		// octets for crc32 (FCS, ICV)



typedef enum rf_optype