mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2025-01-10 16:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from kimocoder/v5.1.5

Browse Source 
Merge changes
This commit is contained in:
evilphish 2017-11-16 10:12:02 +01:00 committed by GitHub
commit 9edb25c686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 109 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Kconfig
View File

@ -4,3 +4,8 @@ config RTL8812AU
---help--- ---help---
Help message of RTL8812AU Help message of RTL8812AU
config RTL8814AU
tristate "Realtek 8814A USB WiFi"
depends on USB
---help---
Help message of RTL8814AU

20
hal/rtl8814a/usb/rtl8814au_xmit.c
View File

@ -22,7 +22,6 @@
//#include <drv_types.h> //#include <drv_types.h>
#include <rtl8814a_hal.h> #include <rtl8814a_hal.h>
s32 rtl8814au_init_xmit_priv(_adapter *padapter) s32 rtl8814au_init_xmit_priv(_adapter *padapter)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -629,9 +628,10 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
// check pkt amount in one bulk // check pkt amount in one bulk
descCount = 0; descCount = 0;
bulkPtr = bulkSize; bulkPtr = bulkSize;
if (pbuf < bulkPtr) if (pbuf < bulkPtr) {
descCount++; descCount++;
if (descCount == pHalData->UsbTxAggDescNum) }
if (descCount == pHalData->UsbTxAggDescNum)
goto agg_end; goto agg_end;
else { else {
descCount = 0; descCount = 0;
@ -816,12 +816,10 @@ agg_end:
// xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr // xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf); rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf);
//3 5. update statisitc //3 5. update statisitc
pbuf_tail -= (pfirstframe->agg_num * TXDESC_SIZE); pbuf_tail -= (pfirstframe->agg_num * TXDESC_SIZE);
pbuf_tail -= (pfirstframe->pkt_offset * PACKET_OFFSET_SZ); pbuf_tail -= (pfirstframe->pkt_offset * PACKET_OFFSET_SZ);
rtw_count_tx_stats(padapter, pfirstframe, pbuf_tail); rtw_count_tx_stats(padapter, pfirstframe, pbuf_tail);
rtw_free_xmitframe(pxmitpriv, pfirstframe); rtw_free_xmitframe(pxmitpriv, pfirstframe);
@ -853,7 +851,6 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
} }
} }
do do
{ {
pxmitframe = rtw_dequeue_xframe(pxmitpriv, phwxmits, hwentry); pxmitframe = rtw_dequeue_xframe(pxmitpriv, phwxmits, hwentry);
@ -876,10 +873,8 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
rtw_os_xmit_complete(padapter, pxmitframe);//always return ndis_packet after rtw_xmitframe_coalesce rtw_os_xmit_complete(padapter, pxmitframe);//always return ndis_packet after rtw_xmitframe_coalesce
} }
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete(): rtw_dump_xframe\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete(): rtw_dump_xframe\n"));
if(res == _SUCCESS) if(res == _SUCCESS)
{ {
rtw_dump_xframe(padapter, pxmitframe); rtw_dump_xframe(padapter, pxmitframe);
@ -908,8 +903,6 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
} }
#endif #endif
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
@ -1024,7 +1017,6 @@ s32 rtl8814au_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmi
} }
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
static void rtl8814au_hostap_mgnt_xmit_cb(struct urb *urb) static void rtl8814au_hostap_mgnt_xmit_cb(struct urb *urb)
@ -1054,7 +1046,6 @@ s32 rtl8814au_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
//RTW_INFO("%s\n", __FUNCTION__); //RTW_INFO("%s\n", __FUNCTION__);
skb = pkt; skb = pkt;
@ -1110,12 +1101,10 @@ s32 rtl8814au_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
//offset 20 //offset 20
//HW append seq //HW append seq
ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); // Hw set sequence number ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); // Hw set sequence number
ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29.
rtl8188eu_cal_txdesc_chksum(ptxdesc); rtl8188eu_cal_txdesc_chksum(ptxdesc);
// ----- end of fill tx desc ----- // ----- end of fill tx desc -----
@ -1126,7 +1115,6 @@ s32 rtl8814au_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
//RTW_INFO("mgnt_xmit, len=%x\n", pxmit_skb->len); //RTW_INFO("mgnt_xmit, len=%x\n", pxmit_skb->len);
// ----- prepare urb for submit ----- // ----- prepare urb for submit -----
//translate DMA FIFO addr to pipehandle //translate DMA FIFO addr to pipehandle
@ -1145,7 +1133,6 @@ s32 rtl8814au_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
} }
usb_free_urb(urb); usb_free_urb(urb);
_exit: _exit:
rtw_skb_free(skb); rtw_skb_free(skb);
@ -1156,4 +1143,3 @@ _exit:
} }
#endif #endif

1
os_dep/linux/usb_intf.c
View File

@ -202,6 +202,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
{USB_DEVICE(0x2019, 0xAB32), .driver_info = RTL8821}, /* Planex - GW-450S */ {USB_DEVICE(0x2019, 0xAB32), .driver_info = RTL8821}, /* Planex - GW-450S */
{USB_DEVICE(0x0846, 0x9052), .driver_info = RTL8821}, /* Netgear - A6100 */ {USB_DEVICE(0x0846, 0x9052), .driver_info = RTL8821}, /* Netgear - A6100 */
{USB_DEVICE(0x0411, 0x029B), .driver_info = RTL8821}, /* Buffalo - WI-U2-433DHP */ {USB_DEVICE(0x0411, 0x029B), .driver_info = RTL8821}, /* Buffalo - WI-U2-433DHP */
{USB_DEVICE(0x056E, 0x4007), .driver_info = RTL8821}, /* Elecom - WDC-433DU2HBK */
#endif #endif
#ifdef CONFIG_RTL8192E #ifdef CONFIG_RTL8192E