diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index 0851ffe..92a3078 100644 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -99,7 +99,6 @@ int rtl8188eu_init_recv_priv(_adapter *padapter) precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF; skb_queue_head_init(&precvpriv->rx_skb_queue); -#ifdef CONFIG_PREALLOC_RECV_SKB { int i; SIZE_PTR tmpaddr=0; @@ -132,7 +131,6 @@ int rtl8188eu_init_recv_priv(_adapter *padapter) } } -#endif exit: @@ -161,11 +159,9 @@ void rtl8188eu_free_recv_priv (_adapter *padapter) DBG_88E(KERN_WARNING "rx_skb_queue not empty\n"); skb_queue_purge(&precvpriv->rx_skb_queue); -#ifdef CONFIG_PREALLOC_RECV_SKB 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)); skb_queue_purge(&precvpriv->free_recv_skb_queue); -#endif } diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 14eabc5..b1639b8 100644 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -578,23 +578,15 @@ void rtl8188eu_recv_tasklet(void *priv) recvbuf2recvframe(padapter, pskb); -#ifdef CONFIG_PREALLOC_RECV_SKB - skb_reset_tail_pointer(pskb); pskb->len = 0; 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) { _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)); - #ifdef CONFIG_PREALLOC_RECV_SKB 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", __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); goto exit; @@ -711,22 +696,15 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) _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")); 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))) - { precvbuf->reuse = true; - } } -#endif - if (precvbuf !=NULL) { diff --git a/include/autoconf.h b/include/autoconf.h index b8374d2..6bb8a07 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -52,8 +52,6 @@ * Interface Related Config */ -#define CONFIG_PREALLOC_RECV_SKB - #define CONFIG_VENDOR_REQ_RETRY /*