From 51e00090df321d1eaed6d9855dbbb695bac893ca Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 27 Feb 2015 20:17:55 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_PREALLOC_RECV_SKB This symbol is always defined. Signed-off-by: Larry Finger --- hal/rtl8188eu_recv.c | 8 -------- hal/usb_ops_linux.c | 21 +-------------------- include/autoconf.h | 6 ------ 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index f937824..52319f3 100755 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -123,7 +123,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) skb_queue_head_init(&precvpriv->rx_skb_queue); -#ifdef CONFIG_PREALLOC_RECV_SKB { int i; SIZE_PTR tmpaddr=0; @@ -151,10 +150,8 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) } } -#endif exit: - return res; } @@ -189,14 +186,9 @@ void rtl8188eu_free_recv_priv (struct adapter *padapter) rtw_skb_queue_purge(&precvpriv->rx_skb_queue); -#ifdef CONFIG_PREALLOC_RECV_SKB - if (skb_queue_len(&precvpriv->free_recv_skb_queue)) { DBG_8192C(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue)); } rtw_skb_queue_purge(&precvpriv->free_recv_skb_queue); - -#endif - } diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 347f31b..82bff6f 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -669,18 +669,11 @@ 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 - rtw_skb_free(pskb); -#endif - } } @@ -713,14 +706,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_8192C("==> free skb(%p)\n",precvbuf->pskb); - rtw_skb_free(precvbuf->pskb); - } - #endif DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); goto exit; @@ -825,15 +811,10 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) 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) { rtl8188eu_init_recvbuf(adapter, precvbuf); diff --git a/include/autoconf.h b/include/autoconf.h index 8773210..0e2f9bd 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -76,12 +76,6 @@ #define CONFIG_BR_EXT_BRNAME "br0" #endif // CONFIG_BR_EXT -/* - * Interface Related Config - */ - -#define CONFIG_PREALLOC_RECV_SKB - /* * USB VENDOR REQ BUFFER ALLOCATION METHOD * if not set we'll use function local variable (stack memory)