diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 45f83c4..66c322e 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -216,29 +216,21 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); sint bmcst = IS_MCAST(pattrib->ra); - #ifdef CONFIG_P2P struct wifidirect_info* pwdinfo = &padapter->wdinfo; #endif /* CONFIG_P2P */ -#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX -if (padapter->registrypriv.mp_mode == 0) -{ - if((!bagg_pkt) &&(urb_zero_packet_chk(padapter, sz)==0))/* sz %512) != 0 */ - /* if((!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==false)) */ - { - ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); - /* DBG_8192C("==> non-agg-pkt,shift pointer...\n"); */ - pull = 1; + if (padapter->registrypriv.mp_mode == 0) { + if((!bagg_pkt) &&(urb_zero_packet_chk(padapter, sz)==0)) { + ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); + pull = 1; + } } -} -#endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ memset(ptxdesc, 0, sizeof(struct tx_desc)); /* 4 offset 0 */ ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); - /* DBG_8192C("%s==> pkt_len=%d,bagg_pkt=%02x\n",__FUNCTION__,sz,bagg_pkt); */ ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);/* update TXPKTSIZE */ offset = TXDESC_SIZE + OFFSET_SZ; @@ -247,16 +239,12 @@ if (padapter->registrypriv.mp_mode == 0) if (bmcst) ptxdesc->txdw0 |= cpu_to_le32(BMC); -#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX - if (padapter->registrypriv.mp_mode == 0) - { - if(!bagg_pkt){ - if((pull) && (pxmitframe->pkt_offset>0)) { + if (padapter->registrypriv.mp_mode == 0) { + if(!bagg_pkt) { + if((pull) && (pxmitframe->pkt_offset>0)) pxmitframe->pkt_offset = pxmitframe->pkt_offset -1; - } } } -#endif /* pkt_offset, unit:8 bytes padding */ if (pxmitframe->pkt_offset > 0) ptxdesc->txdw1 |= cpu_to_le32((pxmitframe->pkt_offset << 26) & 0x7c000000); @@ -789,7 +777,6 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm { rtw_issue_addbareq_cmd(padapter, pfirstframe); } -#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX /* 3 3. update first frame txdesc */ if ((pbuf_tail % bulkSize) == 0) { /* remove pkt_offset */ @@ -797,7 +784,6 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pfirstframe->buf_addr += PACKET_OFFSET_SZ; pfirstframe->pkt_offset--; } -#endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.last_txcmdsz,true); diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index 39564a4..f0120d2 100755 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -531,13 +531,6 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) cnt, usb_write_port_complete, pxmitbuf);/* context is pxmitbuf */ - -#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX - purb->transfer_dma = pxmitbuf->dma_transfer_addr; - purb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; - purb->transfer_flags |= URB_ZERO_PACKET; -#endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ - status = usb_submit_urb(purb, GFP_ATOMIC); if (!status) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index f53f2f4..553704c 100755 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -78,13 +78,6 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct usb_device *pusbd = pdvobjpriv->pusbdev; -#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX - pxmitbuf->pallocated_buf = rtw_usb_buffer_alloc(pusbd, (size_t)alloc_sz, &pxmitbuf->dma_transfer_addr); - pxmitbuf->pbuf = pxmitbuf->pallocated_buf; - if(pxmitbuf->pallocated_buf == NULL) - return _FAIL; -#else /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ - pxmitbuf->pallocated_buf = rtw_zmalloc(alloc_sz); if (pxmitbuf->pallocated_buf == NULL) { @@ -94,13 +87,9 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ); pxmitbuf->dma_transfer_addr = 0; -#endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ - - for(i=0; i<8; i++) - { + for(i=0; i<8; i++) { pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL); - if(pxmitbuf->pxmit_urb[i] == NULL) - { + if(pxmitbuf->pxmit_urb[i] == NULL) { DBG_871X("pxmitbuf->pxmit_urb[i]==NULL"); return _FAIL; } @@ -125,14 +114,8 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitb } } -#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX - rtw_usb_buffer_free(pusbd, (size_t)free_sz, pxmitbuf->pallocated_buf, pxmitbuf->dma_transfer_addr); - pxmitbuf->pallocated_buf = NULL; - pxmitbuf->dma_transfer_addr = 0; -#else /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ if(pxmitbuf->pallocated_buf) rtw_mfree(pxmitbuf->pallocated_buf, free_sz); -#endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ } #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)