rtl8188eu: Remove dead code for CONFIG_USE_USB_BUFFER_ALLOC_RX and remove CONFIG_TX_MCAST2UNI lines

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-12 21:22:50 -05:00
parent 6583d55cd1
commit 7df5fff724
13 changed files with 1 additions and 445 deletions

View file

@ -152,9 +152,7 @@ static int rtw_hwpwrp_detect = 0; //HW power ping detect 0:disable , 1:enable
static int rtw_hw_wps_pbc = 1;
#ifdef CONFIG_TX_MCAST2UNI
int rtw_mc2u_disable = 0;
#endif // CONFIG_TX_MCAST2UNI
#ifdef CONFIG_80211D
static int rtw_80211d = 0;
@ -236,9 +234,7 @@ module_param(rtw_fw_file_path, charp, 0644);
MODULE_PARM_DESC(rtw_fw_file_path, "The path of fw image");
#endif //CONFIG_FILE_FWIMG
#ifdef CONFIG_TX_MCAST2UNI
module_param(rtw_mc2u_disable, int, 0644);
#endif // CONFIG_TX_MCAST2UNI
#ifdef CONFIG_80211D
module_param(rtw_80211d, int, 0644);

View file

@ -81,38 +81,19 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
precvbuf->len = 0;
#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
precvbuf->pallocated_buf = rtw_usb_buffer_alloc(pusbd, (size_t)precvbuf->alloc_sz, &precvbuf->dma_transfer_addr);
precvbuf->pbuf = precvbuf->pallocated_buf;
if (precvbuf->pallocated_buf == NULL)
return _FAIL;
#endif //CONFIG_USE_USB_BUFFER_ALLOC_RX
return res;
}
//free os related resource in struct recv_buf
int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
{
int ret = _SUCCESS;
#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobjpriv->pusbdev;
rtw_usb_buffer_free(pusbd, (size_t)precvbuf->alloc_sz, precvbuf->pallocated_buf, precvbuf->dma_transfer_addr);
precvbuf->pallocated_buf = NULL;
precvbuf->dma_transfer_addr = 0;
#endif //CONFIG_USE_USB_BUFFER_ALLOC_RX
if (precvbuf->purb)
usb_free_urb(precvbuf->purb);
if (precvbuf->pskb)
dev_kfree_skb_any(precvbuf->pskb);
return ret;
return _SUCCESS;
}
void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)

View file

@ -275,7 +275,6 @@ static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
#endif
}
#ifdef CONFIG_TX_MCAST2UNI
static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
{
struct sta_priv *pstapriv = &padapter->stapriv;
@ -326,16 +325,13 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
dev_kfree_skb_any(skb);
return true;
}
#endif // CONFIG_TX_MCAST2UNI
int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#ifdef CONFIG_TX_MCAST2UNI
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#endif // CONFIG_TX_MCAST2UNI
s32 res = 0;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
u16 queue;
@ -355,7 +351,6 @@ _func_enter_;
rtw_check_xmit_resource(padapter, pkt);
#ifdef CONFIG_TX_MCAST2UNI
if ( !rtw_mc2u_disable
&& check_fwstate(pmlmepriv, WIFI_AP_STATE) == true
&& ( IP_MCAST_MAC(pkt->data)
@ -368,12 +363,8 @@ _func_enter_;
if (res == true) {
goto exit;
}
} else {
//DBG_88E("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt);
//DBG_88E("!m2u );
}
}
#endif // CONFIG_TX_MCAST2UNI
res = rtw_xmit(padapter, &pkt);
if (res < 0) {