skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-10 15:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_USB_TX_AGGREGATION

Browse source 
This one was defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-26 14:19:01 -06:00
parent f83ce5782f
commit 3263fc1330
10 changed files with 5 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/rtw_security.c
View file

@ -182,16 +182,8 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL)
return; return;
#ifdef CONFIG_USB_TX_AGGREGATION
hw_hdr_offset = TXDESC_SIZE + hw_hdr_offset = TXDESC_SIZE +
(((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
#else
#ifdef CONFIG_TX_EARLY_MODE
hw_hdr_offset = TXDESC_OFFSET+EARLY_MODE_INFO_SIZE;
#else
hw_hdr_offset = TXDESC_OFFSET;
#endif
#endif
pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset; pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset;
@ -672,16 +664,8 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL)
return _FAIL; return _FAIL;
#ifdef CONFIG_USB_TX_AGGREGATION
hw_hdr_offset = TXDESC_SIZE + hw_hdr_offset = TXDESC_SIZE +
(((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
#else
#ifdef CONFIG_TX_EARLY_MODE
hw_hdr_offset = TXDESC_OFFSET+EARLY_MODE_INFO_SIZE;
#else
hw_hdr_offset = TXDESC_OFFSET;
#endif
#endif
pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset; pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset;
/* 4 start to encrypt each fragment */ /* 4 start to encrypt each fragment */
@ -1600,16 +1584,8 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL)
return _FAIL; return _FAIL;
#ifdef CONFIG_USB_TX_AGGREGATION
hw_hdr_offset = TXDESC_SIZE + hw_hdr_offset = TXDESC_SIZE +
(((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
#else
#ifdef CONFIG_TX_EARLY_MODE
hw_hdr_offset = TXDESC_OFFSET+EARLY_MODE_INFO_SIZE;
#else
hw_hdr_offset = TXDESC_OFFSET;
#endif
#endif
pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset; pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + hw_hdr_offset;

47
core/rtw_xmit.c
View file

@ -909,15 +909,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
; ;
#ifdef CONFIG_USB_TX_AGGREGATION
hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);; hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);;
#else
#ifdef CONFIG_TX_EARLY_MODE
hw_hdr_offset = TXDESC_OFFSET+ EARLY_MODE_INFO_SIZE;
#else
hw_hdr_offset = TXDESC_OFFSET;
#endif
#endif
if(pattrib->encrypt ==_TKIP_)/* if(psecuritypriv->dot11PrivacyAlgrthm==_TKIP_PRIVACY_) */ if(pattrib->encrypt ==_TKIP_)/* if(psecuritypriv->dot11PrivacyAlgrthm==_TKIP_PRIVACY_) */
{ {
@ -1692,15 +1684,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
pbuf_start = pxmitframe->buf_addr; pbuf_start = pxmitframe->buf_addr;
#ifdef CONFIG_USB_TX_AGGREGATION
hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ); hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
#else
#ifdef CONFIG_TX_EARLY_MODE /* for SDIO && Tx Agg */
hw_hdr_offset = TXDESC_OFFSET + EARLY_MODE_INFO_SIZE;
#else
hw_hdr_offset = TXDESC_OFFSET;
#endif
#endif
mem_start = pbuf_start + hw_hdr_offset; mem_start = pbuf_start + hw_hdr_offset;
@ -2176,21 +2160,11 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG)
{ {
pxmitpriv->tx_bytes += sz; pxmitpriv->tx_bytes += sz;
#if defined(CONFIG_USB_TX_AGGREGATION)
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pxmitframe->agg_num; pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pxmitframe->agg_num;
#else
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod++;
#endif
psta = pxmitframe->attrib.psta; psta = pxmitframe->attrib.psta;
if (psta) if (psta) {
{
pstats = &psta->sta_stats; pstats = &psta->sta_stats;
#if defined(CONFIG_USB_TX_AGGREGATION)
pstats->tx_pkts += pxmitframe->agg_num; pstats->tx_pkts += pxmitframe->agg_num;
#else
pstats->tx_pkts++;
#endif
pstats->tx_bytes += sz; pstats->tx_bytes += sz;
} }
} }
@ -2388,10 +2362,7 @@ static void rtw_init_xmitframe(struct xmit_frame *pxframe)
pxframe->pkt = NULL; pxframe->pkt = NULL;
pxframe->pkt_offset = 1;/* default use pkt_offset to fill tx desc */ pxframe->pkt_offset = 1;/* default use pkt_offset to fill tx desc */
#ifdef CONFIG_USB_TX_AGGREGATION
pxframe->agg_num = 1; pxframe->agg_num = 1;
#endif
pxframe->ack_report = 0; pxframe->ack_report = 0;
} }
} }
@ -2625,26 +2596,10 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
xmitframe_plist = get_next(xmitframe_plist); xmitframe_plist = get_next(xmitframe_plist);
/*#ifdef RTK_DMP_PLATFORM
#ifdef CONFIG_USB_TX_AGGREGATION
if((ptxservq->qcnt>0) && (ptxservq->qcnt<=2))
{
pxmitframe = NULL;
tasklet_schedule(&pxmitpriv->xmit_tasklet);
break;
}
#endif
#endif*/
rtw_list_delete(&pxmitframe->list); rtw_list_delete(&pxmitframe->list);
ptxservq->qcnt--; ptxservq->qcnt--;
/* rtw_list_insert_tail(&pxmitframe->list, &phwxmit->pending); */
/* ptxservq->qcnt--; */
break; break;
pxmitframe = NULL; pxmitframe = NULL;

84
hal/rtl8188eu_xmit.c
View file

@ -318,12 +318,10 @@ if (padapter->registrypriv.mp_mode == 0)
ptxdesc->txdw4 |= cpu_to_le32(QOS);/* QoS */ ptxdesc->txdw4 |= cpu_to_le32(QOS);/* QoS */
/* offset 20 */ /* offset 20 */
#ifdef CONFIG_USB_TX_AGGREGATION
if (pxmitframe->agg_num > 1){ if (pxmitframe->agg_num > 1){
/* DBG_8192C("%s agg_num:%d\n",__FUNCTION__,pxmitframe->agg_num ); */ /* DBG_8192C("%s agg_num:%d\n",__FUNCTION__,pxmitframe->agg_num ); */
ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000); ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000);
} }
#endif
if ((pattrib->ether_type != 0x888e) && if ((pattrib->ether_type != 0x888e) &&
(pattrib->ether_type != 0x0806) && (pattrib->ether_type != 0x0806) &&
@ -629,7 +627,6 @@ static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitfra
return ret; return ret;
} }
#ifdef CONFIG_USB_TX_AGGREGATION
static u32 xmitframe_need_length(struct xmit_frame *pxmitframe) static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
{ {
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -947,87 +944,6 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
return true; return true;
} }
#else
s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{
struct hw_xmit *phwxmits;
sint hwentry;
struct xmit_frame *pxmitframe=NULL;
int res=_SUCCESS, xcnt = 0;
phwxmits = pxmitpriv->hwxmits;
hwentry = pxmitpriv->hwxmit_entry;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete()\n"));
if(pxmitbuf==NULL)
{
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if(!pxmitbuf)
{
return false;
}
}
do
{
pxmitframe = rtw_dequeue_xframe(pxmitpriv, phwxmits, hwentry);
if(pxmitframe)
{
pxmitframe->pxmitbuf = pxmitbuf;
pxmitframe->buf_addr = pxmitbuf->pbuf;
pxmitbuf->priv_data = pxmitframe;
if((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG)
{
if(pxmitframe->attrib.priority<=15)/* TID0~15 */
{
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
}
/* DBG_8192C("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority); */
rtw_os_xmit_complete(padapter, pxmitframe);/* always return ndis_packet after rtw_xmitframe_coalesce */
}
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete(): rtw_dump_xframe\n"));
if(res == _SUCCESS)
{
rtw_dump_xframe(padapter, pxmitframe);
}
else
{
rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
rtw_free_xmitframe(pxmitpriv, pxmitframe);
}
xcnt++;
}
else
{
rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
return false;
}
break;
}while(0/*xcnt < (NR_XMITFRAME >> 3)*/);
return true;
}
#endif
static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;

5
hal/usb_halinit.c
View file

@ -125,10 +125,8 @@ static void rtl8188eu_interface_configure(struct adapter *padapter)
pHalData->interfaceIndex = pdvobjpriv->InterfaceNumber; pHalData->interfaceIndex = pdvobjpriv->InterfaceNumber;
#ifdef CONFIG_USB_TX_AGGREGATION
pHalData->UsbTxAggMode = 1; pHalData->UsbTxAggMode = 1;
pHalData->UsbTxAggDescNum = 0x6; /* only 4 bits */ pHalData->UsbTxAggDescNum = 0x6; /* only 4 bits */
#endif
#ifdef CONFIG_USB_RX_AGGREGATION #ifdef CONFIG_USB_RX_AGGREGATION
pHalData->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */ pHalData->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */
@ -838,7 +836,6 @@ usb_AggSettingTxUpdate(
IN struct adapter * Adapter IN struct adapter * Adapter
) )
{ {
#ifdef CONFIG_USB_TX_AGGREGATION
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
/* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */ /* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */
u32 value32; u32 value32;
@ -853,8 +850,6 @@ usb_AggSettingTxUpdate(
rtw_write32(Adapter, REG_TDECTRL, value32); rtw_write32(Adapter, REG_TDECTRL, value32);
} }
#endif
} /* usb_AggSettingTxUpdate */ } /* usb_AggSettingTxUpdate */

5
include/autoconf.h
View file

@ -85,7 +85,6 @@
* Interface Related Config * Interface Related Config
*/ */
#define CONFIG_USB_TX_AGGREGATION
#define CONFIG_USB_RX_AGGREGATION #define CONFIG_USB_RX_AGGREGATION
#define CONFIG_PREALLOC_RECV_SKB #define CONFIG_PREALLOC_RECV_SKB
@ -144,10 +143,6 @@
//#endif //#endif
#ifdef CONFIG_USB_TX_AGGREGATION
//#define CONFIG_TX_EARLY_MODE
#endif
#ifdef CONFIG_TX_EARLY_MODE #ifdef CONFIG_TX_EARLY_MODE
#define RTL8188E_EARLY_MODE_PKT_NUM_10 0 #define RTL8188E_EARLY_MODE_PKT_NUM_10 0
#endif #endif

2
include/rtl8188e_hal.h
View file

@ -481,10 +481,8 @@ typedef struct hal_data_8188e
u32 IntArray[3];//HISR0,HISR1,HSISR u32 IntArray[3];//HISR0,HISR1,HSISR
u32 IntrMask[3]; u32 IntrMask[3];
u8 C2hArray[16]; u8 C2hArray[16];
#ifdef CONFIG_USB_TX_AGGREGATION
u8 UsbTxAggMode; u8 UsbTxAggMode;
u8 UsbTxAggDescNum; u8 UsbTxAggDescNum;
#endif
#ifdef CONFIG_USB_RX_AGGREGATION #ifdef CONFIG_USB_RX_AGGREGATION
u16 HwRxPageSize; // Hardware setting u16 HwRxPageSize; // Hardware setting
u32 MaxUsbRxAggBlock; u32 MaxUsbRxAggBlock;

2
include/rtl8192c_hal.h
View file

@ -477,10 +477,8 @@ struct hal_data_8192cu
u8 OutEpQueueSel; u8 OutEpQueueSel;
u8 OutEpNumber; u8 OutEpNumber;
#ifdef CONFIG_USB_TX_AGGREGATION
u8 UsbTxAggMode; u8 UsbTxAggMode;
u8 UsbTxAggDescNum; u8 UsbTxAggDescNum;
#endif
#ifdef CONFIG_USB_RX_AGGREGATION #ifdef CONFIG_USB_RX_AGGREGATION
u16 HwRxPageSize; // Hardware setting u16 HwRxPageSize; // Hardware setting
u32 MaxUsbRxAggBlock; u32 MaxUsbRxAggBlock;

2
include/rtl8192c_xmit.h
View file

@ -113,9 +113,7 @@ struct txrpt_ccx_8192c {
void dump_txrpt_ccx_8192c(void *buf); void dump_txrpt_ccx_8192c(void *buf);
void handle_txrpt_ccx_8192c(struct adapter *adapter, void *buf); void handle_txrpt_ccx_8192c(struct adapter *adapter, void *buf);
#ifdef CONFIG_USB_TX_AGGREGATION
#define MAX_TX_AGG_PACKET_NUMBER 0xFF #define MAX_TX_AGG_PACKET_NUMBER 0xFF
#endif
s32 rtl8192cu_init_xmit_priv(struct adapter * padapter); s32 rtl8192cu_init_xmit_priv(struct adapter * padapter);

13
include/rtw_xmit.h
View file

@ -24,17 +24,8 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifdef CONFIG_USB_TX_AGGREGATION
#if defined(CONFIG_PLATFORM_ARM_SUNxI) || defined(CONFIG_PLATFORM_ARM_SUN6I) || defined(CONFIG_PLATFORM_ARM_SUN7I)
#define MAX_XMITBUF_SZ (12288) //12k 1536*8
#elif defined (CONFIG_PLATFORM_MSTAR)
#define MAX_XMITBUF_SZ 7680 // 7.5k
#else
#define MAX_XMITBUF_SZ (20480) // 20k #define MAX_XMITBUF_SZ (20480) // 20k
#endif
#else
#define MAX_XMITBUF_SZ (2048)
#endif
#ifdef CONFIG_SINGLE_XMIT_BUF #ifdef CONFIG_SINGLE_XMIT_BUF
#define NR_XMITBUFF (1) #define NR_XMITBUFF (1)
#else #else
@ -284,9 +275,7 @@ struct xmit_frame
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
#ifdef CONFIG_USB_TX_AGGREGATION
u8 agg_num; u8 agg_num;
#endif
s8 pkt_offset; s8 pkt_offset;
u8 ack_report; u8 ack_report;

2
os_dep/usb_ops_linux.c
View file

@ -480,10 +480,8 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
u8 agg_num = 1; u8 agg_num = 1;
#ifdef CONFIG_USB_TX_AGGREGATION
if(pxmitframe->agg_num>1) if(pxmitframe->agg_num>1)
agg_num = pxmitframe->agg_num; agg_num = pxmitframe->agg_num;
#endif
if(bmcast) if(bmcast)
psta = rtw_get_bcmc_stainfo(padapter); psta = rtw_get_bcmc_stainfo(padapter);