#include <usb_ops.h>
#include <circ_buf.h>
#include <recv_osdep.h>
+//#include <rtl8192c_hal.h>
#include <rtl8723a_hal.h>
#include <rtl8723a_recv.h>
u8 *pIo_buf;
int vendorreq_times = 0;
- #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
+#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
u8 *tmp_buf;
- #else // use stack memory
+#else // use stack memory
u8 tmp_buf[MAX_USB_IO_CTL_SIZE];
- #endif
+#endif
#ifdef CONFIG_CONCURRENT_MODE
if(padapter->adapter_type > PRIMARY_ADAPTER)
#endif
- //DBG_871X("%s %s:%d\n",__FUNCTION__, current->comm, current->pid);
+ //DBG_8723A("%s %s:%d\n",__FUNCTION__, current->comm, current->pid);
if((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)){
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
}
if(len>MAX_VENDOR_REQ_CMD_SIZE){
- DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __FUNCTION__ );
+ DBG_8723A( "[%s] Buffer len error ,vendor request failed\n", __FUNCTION__ );
status = -EINVAL;
goto exit;
}
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
pIo_buf = pdvobjpriv->usb_vendor_req_buf;
#else
- #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
- tmp_buf = rtw_malloc( (u32) len + ALIGNMENT_UNIT);
+#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
+ tmp_buf = kmalloc((u32)len + ALIGNMENT_UNIT, GFP_KERNEL);
tmp_buflen = (u32)len + ALIGNMENT_UNIT;
- #else // use stack memory
+#else // use stack memory
tmp_buflen = MAX_USB_IO_CTL_SIZE;
- #endif
+#endif
// Added by Albert 2010/02/09
// For mstar platform, mstar suggests the address for USB IO should be 16 bytes alignment.
#endif
if ( pIo_buf== NULL) {
- DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ );
+ DBG_8723A( "[%s] pIo_buf == NULL \n", __FUNCTION__ );
status = -ENOMEM;
goto release_mutex;
}
{
memset(pIo_buf, 0, len);
- if (requesttype == 0x01) {
+ if (requesttype == 0x01)
+ {
pipe = usb_rcvctrlpipe(udev, 0);//read_in
reqtype = REALTEK_USB_VENQT_READ;
- } else {
+ }
+ else
+ {
pipe = usb_sndctrlpipe(udev, 0);//write_out
reqtype = REALTEK_USB_VENQT_WRITE;
- memcpy( pIo_buf, pdata, len);
+ memcpy(pIo_buf, pdata, len);
}
+ #if 0
+ //timeout test for firmware downloading
+ status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len
+ , ((value >= FW_8192C_START_ADDRESS && value <= FW_8192C_END_ADDRESS) ||value!=0x1000) ?RTW_USB_CONTROL_MSG_TIMEOUT : RTW_USB_CONTROL_MSG_TIMEOUT_TEST
+ );
+ #else
status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
+ #endif
if ( status == len) // Success this control transfer.
{
rtw_reset_continual_urb_error(pdvobjpriv);
if ( requesttype == 0x01 )
{ // For Control read transfer, we have to copy the read data from pIo_buf to pdata.
- memcpy( pdata, pIo_buf, len );
+ memcpy(pdata, pIo_buf, len );
}
}
else { // error cases
- DBG_8192C("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n"
+ DBG_8723A("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n"
, value,(requesttype == 0x01)?"read":"write" , len, status, *(u32*)pdata, vendorreq_times);
if (status < 0) {
if(status == (-ESHUTDOWN) || status == -ENODEV )
{
- padapter->bSurpriseRemoved = true;
+ padapter->bSurpriseRemoved = _TRUE;
} else {
#ifdef DBG_CONFIG_ERROR_DETECT
{
if(status > 0) {
if ( requesttype == 0x01 )
{ // For Control read transfer, we have to copy the read data from pIo_buf to pdata.
- memcpy( pdata, pIo_buf, len );
+ memcpy(pdata, pIo_buf, len );
}
}
}
- if(rtw_inc_and_chk_continual_urb_error(pdvobjpriv) == true ){
- padapter->bSurpriseRemoved = true;
+ if(rtw_inc_and_chk_continual_urb_error(pdvobjpriv) == _TRUE ){
+ padapter->bSurpriseRemoved = _TRUE;
break;
}
}
// release IO memory used by vendorreq
- #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
- rtw_mfree(tmp_buf, tmp_buflen);
- #endif
+#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
+ kfree(tmp_buf);
+#endif
release_mutex:
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
}
#ifdef CONFIG_USB_INTERRUPT_IN_PIPE
+#if 0
+/**
+* Log the Interrupt value and update counter no matter STA is associated or not. It is
+* implemented for FPGA verification stage because we need to now whether the current FPGA
+* platform is alive
+*
+* \param pAdapter The adapter context for this minoport
+* \param IsrContent The ISR value read from hardware in MPISR
+*
+* We sholud remove this function later because DDK suggest not to executing too many
+* operations in MPISR
+*/
+VOID
+LogInterruptHistory8723AU(
+ PADAPTER Adapter
+)
+{
+ HAL_DATA_TYPE *pHalData=GET_HAL_DATA(Adapter);
+
+// if(pHalData->IntArray[0] & IMR_COMDOK)
+// pHalData->InterruptLog.nIMR_COMDOK++;
+ if(pHalData->IntArray[0] & UHIMR_VODOK)
+ {
+ pHalData->InterruptLog.nIMR_VODOK++;
+ DBG_8723A("UHIMR_VODOK %d \n", pHalData->InterruptLog.nIMR_VODOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_VIDOK)
+ {
+ pHalData->InterruptLog.nIMR_VIDOK++;
+ DBG_8723A("UHIMR_VIDOK %d\n", pHalData->InterruptLog.nIMR_VIDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_MGNTDOK)
+ {
+ pHalData->InterruptLog.nIMR_MGNTDOK++;
+ DBG_8723A("UHIMR_MGNTDOK %d\n", pHalData->InterruptLog.nIMR_MGNTDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_BEDOK)
+ {
+ pHalData->InterruptLog.nIMR_BEDOK++;
+ DBG_8723A("UHIMR_BEDOK %d\n", pHalData->InterruptLog.nIMR_BEDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_BKDOK)
+ {
+ pHalData->InterruptLog.nIMR_BKDOK++;
+ DBG_8723A("UHIMR_BKDOK %d\n", pHalData->InterruptLog.nIMR_BKDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_ROK)
+ {
+ pHalData->InterruptLog.nIMR_ROK++;
+ DBG_8723A("UHIMR_ROK %d\n", pHalData->InterruptLog.nIMR_ROK);
+ }
+
+ if(pHalData->IntArray[0] & UHIMR_TXBCNOK)
+ {
+ pHalData->InterruptLog.nIMR_TBDOK++;
+ DBG_8723A("UHIMR_TXBCNOK %d\n", pHalData->InterruptLog.nIMR_TBDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_BCNDOK0)
+ {
+ pHalData->InterruptLog.nIMR_BDOK++;
+ DBG_8723A("UHIMR_BCNDOK0 %d\n", pHalData->InterruptLog.nIMR_BDOK);
+ }
+ if(pHalData->IntArray[0] & UHIMR_C2HCMD)
+ {
+ pHalData->InterruptLog.nIMR_C2HCMD++;
+ DBG_8723A("UHIMR_C2HCMD %d\n", pHalData->InterruptLog.nIMR_C2HCMD);
+ }
+ if(pHalData->IntArray[0] & UHIMR_CPWM)
+ {
+ pHalData->InterruptLog.nIMR_C2HCMD++;
+ DBG_8723A("UHIMR_CPWM %d\n", pHalData->InterruptLog.nIMR_CPWM);
+ }
+
+// if(pHalData->IntArray[0] & IMR_RXCMDOK)
+// pHalData->InterruptLog.nIMR_RCOK++;
+ if(pHalData->IntArray[0] & UHIMR_RDU)
+ {
+ pHalData->InterruptLog.nIMR_RDU++;
+ DBG_8723A("UHIMR_RDU %d\n", pHalData->InterruptLog.nIMR_RDU);
+ }
+
+ if(pHalData->IntArray[1] & UHIMR_RXFOVW)
+ {
+ pHalData->InterruptLog.nIMR_RXFOVW++;
+ DBG_8723A("UHIMR_RXFOVW %d\n", pHalData->InterruptLog.nIMR_RXFOVW);
+ }
+
+
+}
+#endif
//
// Description:
// Recognize the interrupt content by reading the interrupt register or content and masking interrupt mask (IMR)
// [in] ContentLen -
// The length in byte of pContent.
// Return:
-// If any interrupt matches the mask (IMR), return true, and return false otherwise.
+// If any interrupt matches the mask (IMR), return TRUE, and return FALSE otherwise.
//
bool
InterruptRecognized8723AU(
IN PADAPTER Adapter,
- IN void * pContent,
+ IN PVOID pContent,
IN u32 ContentLen
)
{
HAL_DATA_TYPE *pHalData=GET_HAL_DATA(Adapter);
u8 * buffer = (u8 *)pContent;
+// RT_PRINT_DATA(COMP_RECV, DBG_LOUD, ("InterruptRecognized8723AU Interrupt buffer \n"), buffer, MAX_RECEIVE_INTERRUPT_BUFFER_SIZE(Adapter));
memcpy(&(pHalData->IntArray[0]), &(buffer[USB_INTR_CONTENT_HISR_OFFSET]), 4);
+// PlatformMoveMemory(&(pHalData->IntArray[0]), &(buffer[USB_INTR_CONTENT_HISR_OFFSET]), sizeof(u4Byte));
+// DBG_8723A("InterruptRecognized8723AU HISR = 0x%x HIMR = 0x%x\n", pHalData->IntArray[0],pHalData->IntrMask[0]);
pHalData->IntArray[0] &= pHalData->IntrMask[0];
//For HISR extension. Added by tynli. 2009.10.07.
memcpy(&(pHalData->IntArray[1]), &(buffer[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
+// PlatformMoveMemory(&(pHalData->IntArray[1]), &(buffer[USB_INTR_CONTENT_HISRE_OFFSET]), sizeof(u4Byte));
+// DBG_8723A("InterruptRecognized8192CUsb HISRE = 0x%x HIMRE = 0x%x\n", pHalData->IntArray[1], pHalData->IntrMask[1]);
pHalData->IntArray[1] &= pHalData->IntrMask[1];
+
+ // We sholud remove this function later because DDK suggest not to executing too many operations in MPISR
+// if(pHalData->IntArray[0] != 0)
+// LogInterruptHistory8723AU(Adapter);
+
{
struct reportpwrstate_parm report;
memcpy(&report.state, &(buffer[USB_INTR_CPWM_OFFSET]), 1);
#ifdef CONFIG_LPS_LCLK
if( ((pHalData->IntArray[0])&UHIMR_CPWM)){
+// DBG_8723A("%s HIMR=0x%x\n",__func__,pHalData->IntArray[0]);
+ //cpwm_int_hdl(Adapter, &report);
_set_workitem(&Adapter->pwrctrlpriv.cpwm_event);
pHalData->IntArray[0]&= ~UHIMR_CPWM;
+// DBG_8723A("%s HIMR=0x%x\n",__func__,pHalData->IntArray[0]);
}
#endif
}
if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
{
- DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
+ DBG_8723A("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
return;
}
struct c2h_evt_hdr *c2h_evt = (struct c2h_evt_hdr *)purb->transfer_buffer;
if (purb->actual_length > USB_INTR_CONTENT_LENGTH) {
- DBG_8192C("usb_read_interrupt_complete: purb->actual_length > USB_INTR_CONTENT_LENGTH\n");
+ DBG_8723A("usb_read_interrupt_complete: purb->actual_length > USB_INTR_CONTENT_LENGTH\n");
+ goto urb_submit;
}
InterruptRecognized8723AU(padapter, purb->transfer_buffer, purb->actual_length);
if (c2h_evt_exist(c2h_evt)) {
- if ((c2h_evt = (struct c2h_evt_hdr *)rtw_malloc(16)) != NULL) {
+ if (0)
+ DBG_8723A("%s C2H == %d\n", __func__, c2h_evt->id);
+ if (c2h_id_filter_ccx_8723a(c2h_evt->id)) {
+ /* Handle CCX report here */
+ handle_txrpt_ccx_8723a(padapter, (void *)(c2h_evt->payload));
+ /* Replace with special pointer to trigger c2h_evt_clear */
+ if (rtw_cbuf_push(padapter->evtpriv.c2h_queue, (void*)&padapter->evtpriv) != _SUCCESS)
+ DBG_8723A("%s rtw_cbuf_push fail\n", __func__);
+ _set_workitem(&padapter->evtpriv.c2h_wk);
+ } else if ((c2h_evt = (struct c2h_evt_hdr *)rtw_malloc(16)) != NULL) {
memcpy(c2h_evt, purb->transfer_buffer, 16);
- rtw_c2h_wk_cmd(padapter, (u8 *)c2h_evt);
+ if (rtw_cbuf_push(padapter->evtpriv.c2h_queue, (void*)c2h_evt) != _SUCCESS)
+ DBG_8723A("%s rtw_cbuf_push fail\n", __func__);
+ _set_workitem(&padapter->evtpriv.c2h_wk);
+ } else {
+ /* Error handling for malloc fail */
+ if (rtw_cbuf_push(padapter->evtpriv.c2h_queue, (void*)NULL) != _SUCCESS)
+ DBG_8723A("%s rtw_cbuf_push fail\n", __func__);
+ _set_workitem(&padapter->evtpriv.c2h_wk);
}
}
+urb_submit:
err = usb_submit_urb(purb, GFP_ATOMIC);
if ((err) && (err != (-EPERM)))
{
- DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, purb->status);
+ DBG_8723A("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, purb->status);
}
}
else
{
- DBG_8192C("###=> usb_read_interrupt_complete => urb status(%d)\n", purb->status);
+ DBG_8723A("###=> usb_read_interrupt_complete => urb status(%d)\n", purb->status);
switch (purb->status)
{
case -EPIPE:
case -ENODEV:
case -ESHUTDOWN:
- //padapter->bSurpriseRemoved = true;
- RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bSurpriseRemoved=true\n"));
+ //padapter->bSurpriseRemoved = _TRUE;
+ RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT:
- padapter->bDriverStopped = true;
- RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bDriverStopped=true\n"));
+ padapter->bDriverStopped = _TRUE;
+ RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bDriverStopped=TRUE\n"));
break;
case -EPROTO:
break;
case -EINPROGRESS:
- DBG_8192C("ERROR: URB IS IN PROGRESS!/n");
+ DBG_8723A("ERROR: URB IS IN PROGRESS!/n");
break;
default:
break;
err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC);
if((err) && (err != (-EPERM)))
{
- DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, precvpriv->int_in_urb->status);
+ DBG_8723A("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, precvpriv->int_in_urb->status);
ret = _FAIL;
}
prxstat = (struct recv_stat *)pbuf;
pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff;
- do {
+#if 0 //temp remove when disable usb rx aggregation
+ if((pkt_cnt > 10) || (pkt_cnt < 1) || (transfer_len<RXDESC_SIZE) ||(pkt_len<=0))
+ {
+ return _FAIL;
+ }
+#endif
+
+ do{
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
("recvbuf2recvframe: rxdesc=offsset 0:0x%08x, 4:0x%08x, 8:0x%08x, C:0x%08x\n",
prxstat->rxdw0, prxstat->rxdw1, prxstat->rxdw2, prxstat->rxdw4));
if(precvframe==NULL)
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n"));
- DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__);
goto _exit_recvbuf2recvframe;
}
precvframe->u.hdr.precvbuf = NULL; //can't access the precvbuf for new arch.
precvframe->u.hdr.len=0;
+// rtl8192c_query_rx_desc_status(precvframe, prxstat);
update_recvframe_attrib(precvframe, prxstat);
pattrib = &precvframe->u.hdr.attrib;
if(pattrib->crc_err){
- DBG_8192C("%s()-%d: RX Warning! rx CRC ERROR !!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: RX Warning! rx CRC ERROR !!\n", __FUNCTION__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
if((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n"));
- DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
{
pkt_copy->dev = padapter->pnetdev;
precvframe->u.hdr.pkt = pkt_copy;
+ precvframe->u.hdr.rx_head = pkt_copy->data;
+ precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz;
skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address
skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz.
memcpy(pkt_copy->data, (pbuf + pattrib->shift_sz + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len);
- precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data;
- precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz;
+ precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data;
}
else
{
- DBG_8192C("recvbuf2recvframe:can not allocate memory for skb copy\n");
+ DBG_8723A("recvbuf2recvframe:can not allocate memory for skb copy\n");
//precvframe->u.hdr.pkt = skb_clone(pskb, GFP_ATOMIC);
//precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pbuf;
//precvframe->u.hdr.rx_end = pbuf + (pkt_offset>1612?pkt_offset:1612);
while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue)))
{
- if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true))
+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{
- DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n");
+ DBG_8723A("recv_tasklet => bDriverStopped or bSurpriseRemoved \n");
break;
}
{
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status));
- DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
+ DBG_8723A("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
- if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == true ){
- padapter->bSurpriseRemoved = true;
+ if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){
+ padapter->bSurpriseRemoved = _TRUE;
}
switch(purb->status) {
case -EPIPE:
case -ENODEV:
case -ESHUTDOWN:
- //padapter->bSurpriseRemoved=true;
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=true\n"));
+ //padapter->bSurpriseRemoved=_TRUE;
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT:
- padapter->bDriverStopped=true;
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=true\n"));
+ padapter->bDriverStopped=_TRUE;
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n"));
break;
case -EPROTO:
case -EOVERFLOW:
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break;
case -EINPROGRESS:
- DBG_8192C("ERROR: URB IS IN PROGRESS!/n");
+ DBG_8723A("ERROR: URB IS IN PROGRESS!/n");
break;
default:
break;
int err;
unsigned int pipe;
u32 ret = _SUCCESS;
- struct urb * purb = NULL;
+ PURB purb = NULL;
struct recv_buf *precvbuf = (struct recv_buf *)rmem;
_adapter *adapter = pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter);
if((err) && (err != (-EPERM)))
{
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status));
- DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
+ DBG_8723A("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
ret = _FAIL;
}
_adapter *secondary_padapter = primary_padapter->pbuddy_adapter;
struct recv_priv *precvpriv = &primary_padapter->recvpriv;
_queue *pfree_recv_queue = &precvpriv->free_recv_queue;
- u8 *pbuf = precvframe->u.hdr.rx_head;
+ u8 *pbuf = precvframe->u.hdr.rx_data;
if(!secondary_padapter)
return ret;
paddr1 = GetAddr1Ptr(precvframe->u.hdr.rx_data);
- if(IS_MCAST(paddr1) == false)//unicast packets
+ if(IS_MCAST(paddr1) == _FALSE)//unicast packets
{
//primary_myid = myid(&primary_padapter->eeprompriv);
secondary_myid = myid(&secondary_padapter->eeprompriv);
- if(_rtw_memcmp(paddr1, secondary_myid, ETH_ALEN))
+ if (!memcmp(paddr1, secondary_myid, ETH_ALEN))
{
//change to secondary interface
precvframe->u.hdr.adapter = secondary_padapter;
else // Handle BC/MC Packets
{
- u8 clone = true;
+ u8 clone = _TRUE;
+#if 0
+ u8 type, subtype, *paddr2, *paddr3;
+
+ type = GetFrameType(pbuf);
+ subtype = GetFrameSubType(pbuf); //bit(7)~bit(2)
+
+ switch (type)
+ {
+ case WIFI_MGT_TYPE: //Handle BC/MC mgnt Packets
+ if(subtype == WIFI_BEACON)
+ {
+ paddr3 = GetAddr3Ptr(precvframe->u.hdr.rx_data);
+
+ if (check_fwstate(&secondary_padapter->mlmepriv, _FW_LINKED) &&
+ !memcmp(paddr3, get_bssid(&secondary_padapter->mlmepriv), ETH_ALEN))
+ {
+ //change to secondary interface
+ precvframe->u.hdr.adapter = secondary_padapter;
+ clone = _FALSE;
+ }
+
+ if (check_fwstate(&primary_padapter->mlmepriv, _FW_LINKED) &&
+ !memcmp(paddr3, get_bssid(&primary_padapter->mlmepriv), ETH_ALEN))
+ {
+ if(clone==_FALSE)
+ {
+ clone = _TRUE;
+ }
+ else
+ {
+ clone = _FALSE;
+ }
+
+ precvframe->u.hdr.adapter = primary_padapter;
+ }
+
+ if(check_fwstate(&primary_padapter->mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) ||
+ check_fwstate(&secondary_padapter->mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING))
+ {
+ clone = _TRUE;
+ precvframe->u.hdr.adapter = primary_padapter;
+ }
+
+ }
+ else if(subtype == WIFI_PROBEREQ)
+ {
+ //probe req frame is only for interface2
+ //change to secondary interface
+ precvframe->u.hdr.adapter = secondary_padapter;
+ clone = _FALSE;
+ }
+ break;
+ case WIFI_CTRL_TYPE: // Handle BC/MC ctrl Packets
+
+ break;
+ case WIFI_DATA_TYPE: //Handle BC/MC data Packets
+ //Notes: AP MODE never rx BC/MC data packets
+
+ paddr2 = GetAddr2Ptr(precvframe->u.hdr.rx_data);
+
+ if (!memcmp(paddr2, get_bssid(&secondary_padapter->mlmepriv), ETH_ALEN))
+ {
+ //change to secondary interface
+ precvframe->u.hdr.adapter = secondary_padapter;
+ clone = _FALSE;
+ }
+
+ break;
+ default:
+
+ break;
+ }
+#endif
- if(true == clone) {
+ if(_TRUE == clone)
+ {
//clone/copy to if2
u8 shift_sz = 0;
u32 alloc_sz, skb_len;
struct rx_pkt_attrib *pattrib = NULL;
precvframe_if2 = rtw_alloc_recvframe(pfree_recv_queue);
- if(precvframe_if2) {
+ if(precvframe_if2)
+ {
precvframe_if2->u.hdr.adapter = secondary_padapter;
_rtw_init_listhead(&precvframe_if2->u.hdr.list);
// Modified by Albert 20101213
// For 8 bytes IP header alignment.
if (pattrib->qos) // Qos data, wireless lan header length is 26
+ {
shift_sz = 6;
+ }
else
+ {
shift_sz = 0;
+ }
skb_len = pattrib->pkt_len;
{
pkt_copy->dev = secondary_padapter->pnetdev;
precvframe_if2->u.hdr.pkt = pkt_copy;
+ precvframe_if2->u.hdr.rx_head = pkt_copy->data;
+ precvframe_if2->u.hdr.rx_end = pkt_copy->data + alloc_sz;
skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address
skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz.
memcpy(pkt_copy->data, pbuf, skb_len);
- precvframe_if2->u.hdr.rx_head = precvframe_if2->u.hdr.rx_data = precvframe_if2->u.hdr.rx_tail = pkt_copy->data;
- precvframe_if2->u.hdr.rx_end = pkt_copy->data + alloc_sz;
+ precvframe_if2->u.hdr.rx_data = precvframe_if2->u.hdr.rx_tail = pkt_copy->data;
+
recvframe_put(precvframe_if2, skb_len);
//recvframe_pull(precvframe_if2, drvinfo_sz + RXDESC_SIZE);
} else {
rtw_free_recvframe(precvframe_if2, pfree_recv_queue);
- DBG_8192C("%s()-%d: alloc_skb() failed!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: alloc_skb() failed!\n", __FUNCTION__, __LINE__);
}
}
}
-static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
+static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
{
u8 *pbuf;
u8 shift_sz = 0;
s32 transfer_len;
struct recv_stat *prxstat;
struct phy_stat *pphy_info = NULL;
- struct sk_buff *pkt_copy = NULL;
+ _pkt *pkt_copy = NULL;
union recv_frame *precvframe = NULL;
struct rx_pkt_attrib *pattrib = NULL;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
prxstat = (struct recv_stat *)pbuf;
pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff;
+#if 0 //temp remove when disable usb rx aggregation
+ if((pkt_cnt > 10) || (pkt_cnt < 1) || (transfer_len<RXDESC_SIZE) ||(pkt_len<=0))
+ {
+ return _FAIL;
+ }
+#endif
+
do{
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
("recvbuf2recvframe: rxdesc=offsset 0:0x%08x, 4:0x%08x, 8:0x%08x, C:0x%08x\n",
prxstat = (struct recv_stat *)pbuf;
precvframe = rtw_alloc_recvframe(pfree_recv_queue);
- if(precvframe==NULL) {
+ if(precvframe==NULL)
+ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n"));
- DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__);
goto _exit_recvbuf2recvframe;
}
precvframe->u.hdr.precvbuf = NULL; //can't access the precvbuf for new arch.
precvframe->u.hdr.len=0;
+// rtl8192c_query_rx_desc_status(precvframe, prxstat);
update_recvframe_attrib(precvframe, prxstat);
pattrib = &precvframe->u.hdr.attrib;
if(pattrib->crc_err){
- DBG_8192C("%s()-%d: RX Warning! rx CRC ERROR !!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: RX Warning! rx CRC ERROR !!\n", __FUNCTION__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
if((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n"));
- DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
#else
pkt_copy = netdev_alloc_skb(padapter->pnetdev, alloc_sz);
#endif
- if(pkt_copy) {
+ if(pkt_copy)
+ {
pkt_copy->dev = padapter->pnetdev;
precvframe->u.hdr.pkt = pkt_copy;
+ precvframe->u.hdr.rx_head = pkt_copy->data;
+ precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz;
skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address
skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz.
memcpy(pkt_copy->data, (pbuf + pattrib->shift_sz + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len);
- precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data;
- precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz;
- } else {
- if((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)) {
- DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame \n");
+ precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data;
+ }
+ else
+ {
+ if((pattrib->mfrag == 1)&&(pattrib->frag_num == 0))
+ {
+ DBG_8723A("recvbuf2recvframe: alloc_skb fail , drop frag frame \n");
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
precvframe->u.hdr.pkt = skb_clone(pskb, GFP_ATOMIC);
- if(precvframe->u.hdr.pkt) {
+ if(precvframe->u.hdr.pkt)
+ {
precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail
= pbuf+ pattrib->drvinfo_sz + RXDESC_SIZE;
precvframe->u.hdr.rx_end = pbuf +pattrib->drvinfo_sz + RXDESC_SIZE+ alloc_sz;
- } else {
- DBG_8192C("recvbuf2recvframe: skb_clone fail\n");
+ }
+ else
+ {
+ DBG_8723A("recvbuf2recvframe: skb_clone fail\n");
rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe;
}
}
recvframe_put(precvframe, skb_len);
+ //recvframe_pull(precvframe, drvinfo_sz + RXDESC_SIZE);
- if (pattrib->physt) {
+ if (pattrib->physt)
+ {
pphy_info = (struct phy_stat*)(pbuf + RXDESC_OFFSET);
update_recvframe_phyinfo(precvframe, pphy_info);
}
#ifdef CONFIG_USB_RX_AGGREGATION
- switch(pHalData->UsbRxAggMode) {
- case USB_RX_AGG_DMA:
- case USB_RX_AGG_MIX:
- pkt_offset = (u16)_RND128(pkt_offset);
- break;
- case USB_RX_AGG_USB:
- pkt_offset = (u16)_RND4(pkt_offset);
- break;
- case USB_RX_AGG_DISABLE:
- default:
- break;
+ switch(pHalData->UsbRxAggMode)
+ {
+ case USB_RX_AGG_DMA:
+ case USB_RX_AGG_MIX:
+ pkt_offset = (u16)_RND128(pkt_offset);
+ break;
+ case USB_RX_AGG_USB:
+ pkt_offset = (u16)_RND4(pkt_offset);
+ break;
+ case USB_RX_AGG_DISABLE:
+ default:
+ break;
}
#endif
void rtl8192cu_recv_tasklet(void *priv)
{
- struct sk_buff *pskb;
+ _pkt *pskb;
_adapter *padapter = (_adapter*)priv;
struct recv_priv *precvpriv = &padapter->recvpriv;
while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue)))
{
- if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true))
+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{
- DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n");
+ DBG_8723A("recv_tasklet => bDriverStopped or bSurpriseRemoved \n");
dev_kfree_skb_any(pskb);
break;
}
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{
- unsigned long irqL;
+ _irqL irqL;
uint isevt, *pbuf;
struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
_adapter *padapter =(_adapter *)precvbuf->adapter;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n"));
- //_enter_critical(&precvpriv->lock, &irqL);
- //precvbuf->irp_pending=false;
+ //spin_lock_irqsave(&precvpriv->lock, irqL);
+ //precvbuf->irp_pending=_FALSE;
//precvpriv->rx_pending_cnt --;
- //_exit_critical(&precvpriv->lock, &irqL);
+ //spin_unlock_irqrestore(&precvpriv->lock, irqL);
precvpriv->rx_pending_cnt --;
//if(precvpriv->rx_pending_cnt== 0)
//{
// RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: rx_pending_cnt== 0, set allrxreturnevt!\n"));
- // _rtw_up_sema(&precvpriv->allrxreturnevt);
+ // up(&precvpriv->allrxreturnevt);
//}
if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
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_8192C("==> free skb(%p)\n",precvbuf->pskb);
+ DBG_8723A("==> free skb(%p)\n",precvbuf->pskb);
dev_kfree_skb_any(precvbuf->pskb);
}
#endif
- DBG_8192C("%s()-%d: RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
+ DBG_8723A("%s()-%d: RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__FUNCTION__, __LINE__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
goto exit;
}
if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE))
{
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
- precvbuf->reuse = true;
+ precvbuf->reuse = _TRUE;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
- DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
+ DBG_8723A("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__);
}
else
{
tasklet_schedule(&precvpriv->recv_tasklet);
precvbuf->pskb = NULL;
- precvbuf->reuse = false;
+ precvbuf->reuse = _FALSE;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
}
}
else
{
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status));
+ skb_put(precvbuf->pskb, purb->actual_length);
+ precvbuf->pskb = NULL;
- DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
+ DBG_8723A("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
- if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == true ){
- padapter->bSurpriseRemoved = true;
+ if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){
+ padapter->bSurpriseRemoved = _TRUE;
}
switch(purb->status) {
case -EPIPE:
case -ENODEV:
case -ESHUTDOWN:
- //padapter->bSurpriseRemoved=true;
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=true\n"));
+ //padapter->bSurpriseRemoved=_TRUE;
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT:
- padapter->bDriverStopped=true;
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=true\n"));
+ padapter->bDriverStopped=_TRUE;
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n"));
break;
case -EPROTO:
case -EOVERFLOW:
pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
}
#endif
- precvbuf->reuse = true;
+ precvbuf->reuse = _TRUE;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break;
case -EINPROGRESS:
- DBG_8192C("ERROR: URB IS IN PROGRESS!/n");
+ DBG_8723A("ERROR: URB IS IN PROGRESS!/n");
break;
default:
break;
static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
{
- unsigned long irqL;
+ _irqL irqL;
int err;
unsigned int pipe;
SIZE_PTR tmpaddr=0;
SIZE_PTR alignment=0;
u32 ret = _SUCCESS;
- struct urb * purb = NULL;
+ PURB purb = NULL;
struct recv_buf *precvbuf = (struct recv_buf *)rmem;
_adapter *adapter = pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter);
_func_enter_;
- 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"));
+ 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;
+ }
+
+ if (!precvbuf) {
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precvbuf ==NULL\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;
- }
+ precvbuf->reuse = _TRUE;
}
#endif
- if(precvbuf !=NULL)
- {
- rtl8192cu_init_recvbuf(adapter, precvbuf);
+ rtl8192cu_init_recvbuf(adapter, precvbuf);
- //re-assign for linux based on skb
- if((precvbuf->reuse == false) || (precvbuf->pskb == NULL))
- {
- //precvbuf->pskb = alloc_skb(MAX_RECVBUF_SZ, GFP_ATOMIC);//don't use this after v2.6.25
+ //re-assign for linux based on skb
+ if((precvbuf->reuse == _FALSE) || (precvbuf->pskb == NULL)) {
+ //precvbuf->pskb = alloc_skb(MAX_RECVBUF_SZ, GFP_ATOMIC);//don't use this after v2.6.25
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) // http://www.mail-archive.com/netdev@vger.kernel.org/msg17214.html
- precvbuf->pskb = dev_alloc_skb(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
+ precvbuf->pskb = dev_alloc_skb(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
#else
- precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
+ precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
#endif
- if(precvbuf->pskb == NULL)
- {
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("init_recvbuf(): alloc_skb fail!\n"));
- return _FAIL;
- }
-
- tmpaddr = (SIZE_PTR)precvbuf->pskb->data;
- alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
- skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
-
- precvbuf->phead = precvbuf->pskb->head;
- precvbuf->pdata = precvbuf->pskb->data;
- precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
- precvbuf->pend = skb_end_pointer(precvbuf->pskb);
- precvbuf->pbuf = precvbuf->pskb->data;
+ if(precvbuf->pskb == NULL) {
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("init_recvbuf(): alloc_skb fail!\n"));
+ return _FAIL;
}
- else//reuse skb
- {
- precvbuf->phead = precvbuf->pskb->head;
- precvbuf->pdata = precvbuf->pskb->data;
- precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
- precvbuf->pend = skb_end_pointer(precvbuf->pskb);
- precvbuf->pbuf = precvbuf->pskb->data;
- precvbuf->reuse = false;
- }
+ tmpaddr = (SIZE_PTR)precvbuf->pskb->data;
+ alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
+ skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
- //_enter_critical(&precvpriv->lock, &irqL);
- //precvpriv->rx_pending_cnt++;
- //precvbuf->irp_pending = true;
- //_exit_critical(&precvpriv->lock, &irqL);
+ precvbuf->phead = precvbuf->pskb->head;
+ precvbuf->pdata = precvbuf->pskb->data;
+ precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
+ precvbuf->pend = skb_end_pointer(precvbuf->pskb);
+ precvbuf->pbuf = precvbuf->pskb->data;
+ } else { //reuse skb
+ precvbuf->phead = precvbuf->pskb->head;
+ precvbuf->pdata = precvbuf->pskb->data;
+ precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
+ precvbuf->pend = skb_end_pointer(precvbuf->pskb);
+ precvbuf->pbuf = precvbuf->pskb->data;
+
+ precvbuf->reuse = _FALSE;
+ }
- precvpriv->rx_pending_cnt++;
+ precvpriv->rx_pending_cnt++;
- purb = precvbuf->purb;
+ purb = precvbuf->purb;
- //translate DMA FIFO addr to pipehandle
- pipe = ffaddr2pipehdl(pdvobj, addr);
+ //translate DMA FIFO addr to pipehandle
+ pipe = ffaddr2pipehdl(pdvobj, addr);
- usb_fill_bulk_urb(purb, pusbd, pipe,
- precvbuf->pbuf,
- MAX_RECVBUF_SZ,
- usb_read_port_complete,
- precvbuf);//context is precvbuf
+ usb_fill_bulk_urb(purb, pusbd, pipe,
+ precvbuf->pbuf,
+ MAX_RECVBUF_SZ,
+ usb_read_port_complete,
+ precvbuf);//context is precvbuf
- err = usb_submit_urb(purb, GFP_ATOMIC);
- if((err) && (err != (-EPERM)))
- {
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status));
- DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
- ret = _FAIL;
- }
- }
- else
- {
- RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precvbuf ==NULL\n"));
+ err = usb_submit_urb(purb, GFP_ATOMIC);
+ if((err) && (err != (-EPERM))) {
+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status));
+ DBG_8723A("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
ret = _FAIL;
}
_func_exit_;
-
return ret;
}
#endif // CONFIG_USE_USB_BUFFER_ALLOC_RX
void rtl8192cu_xmit_tasklet(void *priv)
{
- int ret = false;
+ int ret = _FALSE;
_adapter *padapter = (_adapter*)priv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
- if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == true)
+ if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE)
return;
while(1)
{
- if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true) || (padapter->bWritePortCancel == true))
+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE) || (padapter->bWritePortCancel == _TRUE))
{
- DBG_8192C("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n");
+ DBG_8723A("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n");
break;
}
ret = rtl8192cu_xmitframe_complete(padapter, pxmitpriv, NULL);
- if(ret==false)
+ if(ret==_FALSE)
break;
}
_func_exit_;
}
+
void rtl8723au_set_hw_type(_adapter *padapter)
{
padapter->chip_type = RTL8723A;
padapter->HardwareType = HARDWARE_TYPE_RTL8723AU;
- DBG_871X("CHIP TYPE: RTL8723A\n");
+ DBG_8723A("CHIP TYPE: RTL8723A\n");
}
OSDN Git Service
