mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-25 05:53:41 +00:00
rtl8188eu: Remove CONFIG_PREALLOC_RECV_SKB - defined
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
c8327a9118
commit
89aeab9b41
3 changed files with 2 additions and 30 deletions
|
@ -99,7 +99,6 @@ int rtl8188eu_init_recv_priv(_adapter *padapter)
|
||||||
precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF;
|
precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF;
|
||||||
skb_queue_head_init(&precvpriv->rx_skb_queue);
|
skb_queue_head_init(&precvpriv->rx_skb_queue);
|
||||||
|
|
||||||
#ifdef CONFIG_PREALLOC_RECV_SKB
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
SIZE_PTR tmpaddr=0;
|
SIZE_PTR tmpaddr=0;
|
||||||
|
@ -132,7 +131,6 @@ int rtl8188eu_init_recv_priv(_adapter *padapter)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
|
|
||||||
|
@ -161,11 +159,9 @@ void rtl8188eu_free_recv_priv (_adapter *padapter)
|
||||||
DBG_88E(KERN_WARNING "rx_skb_queue not empty\n");
|
DBG_88E(KERN_WARNING "rx_skb_queue not empty\n");
|
||||||
skb_queue_purge(&precvpriv->rx_skb_queue);
|
skb_queue_purge(&precvpriv->rx_skb_queue);
|
||||||
|
|
||||||
#ifdef CONFIG_PREALLOC_RECV_SKB
|
|
||||||
|
|
||||||
if (skb_queue_len(&precvpriv->free_recv_skb_queue))
|
if (skb_queue_len(&precvpriv->free_recv_skb_queue))
|
||||||
DBG_88E(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue));
|
DBG_88E(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue));
|
||||||
|
|
||||||
skb_queue_purge(&precvpriv->free_recv_skb_queue);
|
skb_queue_purge(&precvpriv->free_recv_skb_queue);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -578,23 +578,15 @@ void rtl8188eu_recv_tasklet(void *priv)
|
||||||
|
|
||||||
recvbuf2recvframe(padapter, pskb);
|
recvbuf2recvframe(padapter, pskb);
|
||||||
|
|
||||||
#ifdef CONFIG_PREALLOC_RECV_SKB
|
|
||||||
|
|
||||||
skb_reset_tail_pointer(pskb);
|
skb_reset_tail_pointer(pskb);
|
||||||
|
|
||||||
pskb->len = 0;
|
pskb->len = 0;
|
||||||
|
|
||||||
skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb);
|
skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb);
|
||||||
|
|
||||||
#else
|
|
||||||
dev_kfree_skb_any(pskb);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
|
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
_irqL irqL;
|
_irqL irqL;
|
||||||
|
@ -611,14 +603,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved));
|
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved));
|
||||||
|
|
||||||
#ifdef CONFIG_PREALLOC_RECV_SKB
|
|
||||||
precvbuf->reuse = true;
|
precvbuf->reuse = true;
|
||||||
#else
|
|
||||||
if (precvbuf->pskb){
|
|
||||||
DBG_88E("==> free skb(%p)\n",precvbuf->pskb);
|
|
||||||
dev_kfree_skb_any(precvbuf->pskb);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
|
DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
|
||||||
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
|
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
|
||||||
goto exit;
|
goto exit;
|
||||||
|
@ -711,22 +696,15 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
|
||||||
|
|
||||||
_func_enter_;
|
_func_enter_;
|
||||||
|
|
||||||
if (adapter->bDriverStopped || adapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)
|
if (adapter->bDriverStopped || adapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx) {
|
||||||
{
|
|
||||||
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
|
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
|
||||||
return _FAIL;
|
return _FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PREALLOC_RECV_SKB
|
if ((precvbuf->reuse == false) || (precvbuf->pskb == NULL)) {
|
||||||
if ((precvbuf->reuse == false) || (precvbuf->pskb == NULL))
|
|
||||||
{
|
|
||||||
if (NULL != (precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue)))
|
if (NULL != (precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue)))
|
||||||
{
|
|
||||||
precvbuf->reuse = true;
|
precvbuf->reuse = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
if (precvbuf !=NULL)
|
if (precvbuf !=NULL)
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,8 +52,6 @@
|
||||||
* Interface Related Config
|
* Interface Related Config
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFIG_PREALLOC_RECV_SKB
|
|
||||||
|
|
||||||
#define CONFIG_VENDOR_REQ_RETRY
|
#define CONFIG_VENDOR_REQ_RETRY
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue