mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-06 13:33:06 +00:00
rtl8188eu: Remove CONFIG_USB_TX_AGGREGATION, IDEA_CONDITION, and CONFIG_MINIMAL_MEMORY_USAGE
CONFIG_USB_TX_AGGREGATION is always defined. IDEA_CONDITION is always defined. CONFIG_MINIMAL_MEMORY_USAGE is never defined. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
2462f06b0e
commit
eebbb9babd
8 changed files with 3 additions and 224 deletions
|
|
@ -286,11 +286,9 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
|||
ptxdesc->txdw4 |= cpu_to_le32(QOS);/* QoS */
|
||||
|
||||
/* offset 20 */
|
||||
#ifdef CONFIG_USB_TX_AGGREGATION
|
||||
if (pxmitframe->agg_num > 1){
|
||||
ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000);
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((pattrib->ether_type != 0x888e) &&
|
||||
(pattrib->ether_type != 0x0806) &&
|
||||
|
|
@ -588,7 +586,6 @@ static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_USB_TX_AGGREGATION
|
||||
static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
|
||||
{
|
||||
struct pkt_attrib *pattrib = &pxmitframe->attrib;
|
||||
|
|
@ -607,7 +604,6 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
|
|||
return len;
|
||||
}
|
||||
|
||||
#define IDEA_CONDITION 1 /* check all packets before enqueue */
|
||||
s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
|
|
@ -633,10 +629,6 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
|||
/* dump frame variable */
|
||||
u32 ff_hwaddr;
|
||||
|
||||
#ifndef IDEA_CONDITION
|
||||
int res = _SUCCESS;
|
||||
#endif
|
||||
|
||||
RT_TRACE(_module_rtl8192c_xmit_c_, _drv_info_, ("+xmitframe_complete\n"));
|
||||
|
||||
|
||||
|
|
@ -659,23 +651,6 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
|||
return false;
|
||||
}
|
||||
|
||||
#ifndef IDEA_CONDITION
|
||||
if (pxmitframe->frame_tag != DATA_FRAMETAG) {
|
||||
RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_,
|
||||
("xmitframe_complete: frame tag(%d) is not DATA_FRAMETAG(%d)!\n",
|
||||
pxmitframe->frame_tag, DATA_FRAMETAG));
|
||||
continue;
|
||||
}
|
||||
|
||||
/* TID 0~15 */
|
||||
if ((pxmitframe->attrib.priority < 0) ||
|
||||
(pxmitframe->attrib.priority > 15)) {
|
||||
RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_,
|
||||
("xmitframe_complete: TID(%d) should be 0~15!\n",
|
||||
pxmitframe->attrib.priority));
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
pxmitframe->pxmitbuf = pxmitbuf;
|
||||
pxmitframe->buf_addr = pxmitbuf->pbuf;
|
||||
pxmitbuf->priv_data = pxmitframe;
|
||||
|
|
@ -687,14 +662,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
|||
pxmitframe->pkt_offset = 1; /* first frame of aggregation, reserve offset */
|
||||
#endif
|
||||
|
||||
#ifdef IDEA_CONDITION
|
||||
rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
#else
|
||||
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
if (res == false) {
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* always return ndis_packet after rtw_xmitframe_coalesce */
|
||||
rtw_os_xmit_complete(padapter, pxmitframe);
|
||||
|
|
@ -775,39 +743,9 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
|||
ptxservq->qcnt--;
|
||||
phwxmit->accnt--;
|
||||
|
||||
#ifndef IDEA_CONDITION
|
||||
/* suppose only data frames would be in queue */
|
||||
if (pxmitframe->frame_tag != DATA_FRAMETAG) {
|
||||
RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_,
|
||||
("xmitframe_complete: frame tag(%d) is not DATA_FRAMETAG(%d)!\n",
|
||||
pxmitframe->frame_tag, DATA_FRAMETAG));
|
||||
rtw_free_xmitframe(pxmitpriv, pxmitframe);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* TID 0~15 */
|
||||
if ((pxmitframe->attrib.priority < 0) ||
|
||||
(pxmitframe->attrib.priority > 15)) {
|
||||
RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_,
|
||||
("xmitframe_complete: TID(%d) should be 0~15!\n",
|
||||
pxmitframe->attrib.priority));
|
||||
rtw_free_xmitframe(pxmitpriv, pxmitframe);
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
||||
pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf;
|
||||
|
||||
#ifdef IDEA_CONDITION
|
||||
rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
#else
|
||||
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
if (res == false) {
|
||||
DBG_88E("%s coalesce failed\n",__func__);
|
||||
rtw_free_xmitframe(pxmitpriv, pxmitframe);
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
/* always return ndis_packet after rtw_xmitframe_coalesce */
|
||||
rtw_os_xmit_complete(padapter, pxmitframe);
|
||||
|
||||
|
|
@ -889,86 +827,6 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
|||
return true;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
s32 rtl8188eu_xmitframe_complete(_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);
|
||||
}
|
||||
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(_adapter *padapter, struct xmit_frame *pxmitframe)
|
||||
{
|
||||
s32 res = _SUCCESS;
|
||||
|
|
|
|||
|
|
@ -118,10 +118,8 @@ static void rtl8188eu_interface_configure(_adapter *padapter)
|
|||
|
||||
pHalData->interfaceIndex = pdvobjpriv->InterfaceNumber;
|
||||
|
||||
#ifdef CONFIG_USB_TX_AGGREGATION
|
||||
pHalData->UsbTxAggMode = 1;
|
||||
pHalData->UsbTxAggDescNum = 0x6; /* only 4 bits */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_RX_AGGREGATION
|
||||
pHalData->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */
|
||||
|
|
@ -779,7 +777,6 @@ usb_AggSettingTxUpdate(
|
|||
PADAPTER Adapter
|
||||
)
|
||||
{
|
||||
#ifdef CONFIG_USB_TX_AGGREGATION
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
u32 value32;
|
||||
|
||||
|
|
@ -793,8 +790,6 @@ usb_AggSettingTxUpdate(
|
|||
|
||||
rtw_write32(Adapter, REG_TDECTRL, value32);
|
||||
}
|
||||
|
||||
#endif
|
||||
} /* usb_AggSettingTxUpdate */
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue