mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2025-01-03 21:04:05 +00:00
Merge pull request #74 from kimocoder/v5.1.5
Cleanup + Monitor crash fix
This commit is contained in:
Christian B
GitHub
commit
cd1535f2fa
@ -70,8 +70,6 @@ WLAN_PWR_CFG rtl8814A_resume_flow[RTL8814A_TRANS_ACT_TO_CARDEMU_STEPS+RTL8814A_T
|
||||
RTL8814A_TRANS_END
|
||||
};
|
||||
|
||||
|
||||
|
||||
//3HWPDN Array
|
||||
WLAN_PWR_CFG rtl8814A_hwpdn_flow[RTL8814A_TRANS_ACT_TO_CARDEMU_STEPS+RTL8814A_TRANS_CARDEMU_TO_PDN_STEPS+RTL8814A_TRANS_END_STEPS]=
|
||||
{
|
||||
@ -95,4 +93,3 @@ WLAN_PWR_CFG rtl8814A_leave_lps_flow[RTL8814A_TRANS_LPS_TO_ACT_STEPS+RTL8814A_TR
|
||||
RTL8814A_TRANS_LPS_TO_ACT
|
||||
RTL8814A_TRANS_END
|
||||
};
|
||||
|
||||
|
||||
@ -78,8 +78,7 @@ s32 FillH2CCmd_8814(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
|
||||
pHalData = GET_HAL_DATA(padapter);
|
||||
|
||||
|
||||
if(padapter->bFWReady == _FALSE)
|
||||
{
|
||||
if(padapter->bFWReady == _FALSE) {
|
||||
//RTW_INFO("FillH2CCmd_8814(): return H2C cmd because fw is not ready\n");
|
||||
return ret;
|
||||
}
|
||||
@ -107,8 +106,7 @@ s32 FillH2CCmd_8814(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
|
||||
|
||||
*(u8*)(&h2c_cmd) = ElementID;
|
||||
|
||||
if(CmdLen<=3)
|
||||
{
|
||||
if(CmdLen<=3) {
|
||||
_rtw_memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer, CmdLen );
|
||||
}
|
||||
else {
|
||||
@ -194,15 +192,13 @@ u8 Get_VHT_ENI(
|
||||
{
|
||||
u8 Ret = 0;
|
||||
|
||||
if(WirelessMode == WIRELESS_11_24AC)
|
||||
{
|
||||
if (WirelessMode == WIRELESS_11_24AC) {
|
||||
if (ratr_bitmap & 0xfff00000) // Mix , 2SS
|
||||
Ret = 3;
|
||||
else // Mix, 1SS
|
||||
Ret = 2;
|
||||
}
|
||||
else if(WirelessMode == WIRELESS_11_5AC)
|
||||
{
|
||||
else if (WirelessMode == WIRELESS_11_5AC) {
|
||||
Ret = 1; // VHT
|
||||
}
|
||||
|
||||
@ -248,15 +244,13 @@ Set_RA_LDPC_8814(
|
||||
if (psta == NULL)
|
||||
return;
|
||||
#ifdef CONFIG_80211AC_VHT
|
||||
if(psta->wireless_mode == WIRELESS_11_5AC)
|
||||
{
|
||||
if (psta->wireless_mode == WIRELESS_11_5AC) {
|
||||
if (bLDPC && TEST_FLAG(psta->vhtpriv.ldpc_cap, LDPC_VHT_CAP_TX))
|
||||
SET_FLAG(psta->vhtpriv.ldpc_cap, LDPC_VHT_ENABLE_TX);
|
||||
else
|
||||
CLEAR_FLAG(psta->vhtpriv.ldpc_cap, LDPC_VHT_ENABLE_TX);
|
||||
}
|
||||
else if(IsSupportedHT(psta->wireless_mode) || IsSupportedVHT(psta->wireless_mode))
|
||||
{
|
||||
else if(IsSupportedHT(psta->wireless_mode) || IsSupportedVHT(psta->wireless_mode)) {
|
||||
if (bLDPC && TEST_FLAG(psta->htpriv.ldpc_cap, LDPC_HT_CAP_TX))
|
||||
SET_FLAG(psta->htpriv.ldpc_cap, LDPC_HT_ENABLE_TX);
|
||||
else
|
||||
@ -289,14 +283,12 @@ Get_RA_LDPC_8814(
|
||||
else
|
||||
bLDPC = 0;
|
||||
}
|
||||
else if(IsSupportedHT(psta->wireless_mode))
|
||||
{
|
||||
else if (IsSupportedHT(psta->wireless_mode)) {
|
||||
if (TEST_FLAG(psta->htpriv.ldpc_cap, LDPC_HT_CAP_TX))
|
||||
bLDPC =1;
|
||||
else
|
||||
bLDPC =0;
|
||||
}
|
||||
else
|
||||
} else
|
||||
#endif
|
||||
bLDPC = 0;
|
||||
}
|
||||
@ -326,8 +318,7 @@ void rtl8814_set_raid_cmd(PADAPTER padapter, u64 bitmap, u8* arg, u8 bw)
|
||||
}
|
||||
|
||||
|
||||
if(pHalData->fw_ractrl == _TRUE)
|
||||
{
|
||||
if (pHalData->fw_ractrl == _TRUE) {
|
||||
u8 H2CCommand[7] ={0};
|
||||
|
||||
shortGIrate = Get_RA_ShortGI_8814(padapter, psta, shortGIrate, bitmap);
|
||||
@ -340,8 +331,7 @@ void rtl8814_set_raid_cmd(PADAPTER padapter, u64 bitmap, u8* arg, u8 bw)
|
||||
if (pHalData->bDisableTXPowerTraining) {
|
||||
H2CCommand[2] |= BIT6;
|
||||
RTW_INFO("%s,Disable PWT by driver\n",__FUNCTION__);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
PDM_ODM_T pDM_OutSrc = &pHalData->odmpriv;
|
||||
|
||||
if (pDM_OutSrc->bDisablePowerTraining){
|
||||
@ -408,11 +398,9 @@ void rtl8814_set_FwPwrMode_cmd(PADAPTER padapter, u8 PSMode)
|
||||
break;
|
||||
}
|
||||
|
||||
if (Mode > PS_MODE_ACTIVE)
|
||||
{
|
||||
if (Mode > PS_MODE_ACTIVE) {
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
if ((rtw_btcoex_IsBtControlLps(padapter) == _TRUE) && (_TRUE == pHalData->EEPROMBluetoothCoexist))
|
||||
{
|
||||
if ((rtw_btcoex_IsBtControlLps(padapter) == _TRUE) && (_TRUE == pHalData->EEPROMBluetoothCoexist)) {
|
||||
PowerState = rtw_btcoex_RpwmVal(padapter);
|
||||
pwrModeByte5 = rtw_btcoex_LpsVal(padapter);
|
||||
}
|
||||
@ -426,9 +414,7 @@ void rtl8814_set_FwPwrMode_cmd(PADAPTER padapter, u8 PSMode)
|
||||
#ifdef CONFIG_EXT_CLK
|
||||
Mode |= BIT(7);//supporting 26M XTAL CLK_Request feature.
|
||||
#endif //CONFIG_EXT_CLK
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
PowerState = 0x0C;// AllON(0x0C), RFON(0x04), RFOFF(0x00)
|
||||
pwrModeByte5 = 0x40;
|
||||
}
|
||||
@ -508,8 +494,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
|
||||
pframe += 2;
|
||||
pktlen += 2;
|
||||
|
||||
if( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
|
||||
{
|
||||
if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
|
||||
//RTW_INFO("ie len=%d\n", cur_network->IELength);
|
||||
pktlen += cur_network->IELength - sizeof(NDIS_802_11_FIXED_IEs);
|
||||
_rtw_memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen);
|
||||
@ -529,8 +514,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
|
||||
// DS parameter set
|
||||
pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen);
|
||||
|
||||
if( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)
|
||||
{
|
||||
if ( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
u32 ATIMWindow;
|
||||
// IBSS Parameter Set...
|
||||
//ATIMWindow = cur->Configuration.ATIMWindow;
|
||||
@ -543,8 +527,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
|
||||
|
||||
|
||||
// EXTERNDED SUPPORTED RATE
|
||||
if (rate_len > 8)
|
||||
{
|
||||
if (rate_len > 8) {
|
||||
pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pktlen);
|
||||
}
|
||||
|
||||
@ -553,8 +536,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
|
||||
|
||||
_ConstructBeacon:
|
||||
|
||||
if ((pktlen + TXDESC_SIZE) > 512)
|
||||
{
|
||||
if ((pktlen + TXDESC_SIZE) > 512) {
|
||||
RTW_INFO("beacon frame too large\n");
|
||||
return;
|
||||
}
|
||||
@ -620,8 +602,7 @@ void ConstructNullFunctionData(
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
*(fctrl) = 0;
|
||||
if (bForcePowerSave)
|
||||
{
|
||||
if (bForcePowerSave) {
|
||||
SetPwrMgt(fctrl);
|
||||
}
|
||||
|
||||
@ -678,7 +659,6 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
|
||||
|
||||
//RTW_INFO("%s\n", __FUNCTION__);
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
@ -758,8 +738,7 @@ static void ConstructGTKResponse(
|
||||
//-------------------------------------------------------------------------
|
||||
// Qos Header: leave space for it if necessary.
|
||||
//-------------------------------------------------------------------------
|
||||
if(pStaQos->CurrentQosMode > QOS_DISABLE)
|
||||
{
|
||||
if(pStaQos->CurrentQosMode > QOS_DISABLE) {
|
||||
SET_80211_HDR_QOS_EN(pGTKRspPkt, 1);
|
||||
PlatformZeroMemory(&(Buffer[*pLength]), sQoSCtlLng);
|
||||
*pLength += sQoSCtlLng;
|
||||
@ -791,8 +770,7 @@ static void ConstructGTKResponse(
|
||||
EncryptionHeadOverhead = 0;
|
||||
}
|
||||
|
||||
if(EncryptionHeadOverhead > 0)
|
||||
{
|
||||
if (EncryptionHeadOverhead > 0) {
|
||||
_rtw_memset(&(pframe[*pLength]), 0,EncryptionHeadOverhead);
|
||||
*pLength += EncryptionHeadOverhead;
|
||||
//SET_80211_HDR_WEP(pGTKRspPkt, 1); //Suggested by CCW.
|
||||
@ -833,8 +811,7 @@ CheckFwRsvdPageContent(
|
||||
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter);
|
||||
u32 MaxBcnPageNum;
|
||||
|
||||
if(pHalData->FwRsvdPageStartOffset != 0)
|
||||
{
|
||||
if(pHalData->FwRsvdPageStartOffset != 0) {
|
||||
/*MaxBcnPageNum = PageNum_128(pMgntInfo->MaxBeaconSize);
|
||||
RT_ASSERT((MaxBcnPageNum <= pHalData->FwRsvdPageStartOffset),
|
||||
("CheckFwRsvdPageContent(): The reserved page content has been"\
|
||||
@ -855,12 +832,9 @@ GetTxBufferRsvdPageNum8814(_adapter *Adapter, bool bWoWLANBoundary)
|
||||
u8 RsvdPageNum=0;
|
||||
u16 TxPageBndy= LAST_ENTRY_OF_TX_PKT_BUFFER_8814A; // default reseved 1 page for the IC type which is undefined.
|
||||
|
||||
if(bWoWLANBoundary)
|
||||
{
|
||||
if(bWoWLANBoundary) {
|
||||
rtw_hal_get_def_var(Adapter, HAL_DEF_TX_PAGE_BOUNDARY_WOWLAN, (u8 *)&TxPageBndy);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
rtw_hal_get_def_var(Adapter, HAL_DEF_TX_PAGE_BOUNDARY, (u8 *)&TxPageBndy);
|
||||
}
|
||||
|
||||
@ -869,7 +843,6 @@ GetTxBufferRsvdPageNum8814(_adapter *Adapter, bool bWoWLANBoundary)
|
||||
return RsvdPageNum;
|
||||
}
|
||||
|
||||
|
||||
void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
@ -882,8 +855,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
|
||||
RTW_INFO("%s mstatus(%x)\n", __FUNCTION__,mstatus);
|
||||
|
||||
if(mstatus == 1)
|
||||
{
|
||||
if(mstatus == 1) {
|
||||
// We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C.
|
||||
// Suggested by filen. Added by tynli.
|
||||
rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000|pmlmeinfo->aid));
|
||||
@ -906,8 +878,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&(~BIT(3)));
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(4));
|
||||
|
||||
if(pHalData->RegFwHwTxQCtrl&BIT6)
|
||||
{
|
||||
if(pHalData->RegFwHwTxQCtrl&BIT6) {
|
||||
RTW_INFO("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n");
|
||||
bSendBeacon = _TRUE;
|
||||
}
|
||||
@ -920,13 +891,11 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
|
||||
DLBcnCount = 0;
|
||||
poll = 0;
|
||||
do
|
||||
{
|
||||
do {
|
||||
// download rsvd page.
|
||||
rtw_hal_set_fw_rsvd_page(padapter, _FALSE);
|
||||
DLBcnCount++;
|
||||
do
|
||||
{
|
||||
do {
|
||||
rtw_yield_os();
|
||||
//rtw_mdelay_os(10);
|
||||
// check rsvd page download OK.
|
||||
@ -955,21 +924,17 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
// the beacon TCB in the following code. 2011.11.23. by tynli.
|
||||
//
|
||||
//if(bcn_valid && padapter->bEnterPnpSleep)
|
||||
if(0)
|
||||
{
|
||||
if(bSendBeacon)
|
||||
{
|
||||
if(0) {
|
||||
if(bSendBeacon) {
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
|
||||
DLBcnCount = 0;
|
||||
poll = 0;
|
||||
do
|
||||
{
|
||||
do {
|
||||
//SetFwRsvdPagePkt_8812(padapter, _TRUE);
|
||||
rtw_hal_set_fw_rsvd_page(padapter, _TRUE);
|
||||
DLBcnCount++;
|
||||
|
||||
do
|
||||
{
|
||||
do {
|
||||
rtw_yield_os();
|
||||
//rtw_mdelay_os(10);
|
||||
// check rsvd page download OK.
|
||||
@ -999,8 +964,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
// prevent from setting 0x422[6] to 0 after download reserved page, or it will cause
|
||||
// the beacon cannot be sent by HW.
|
||||
// 2010.06.23. Added by tynli.
|
||||
if(bSendBeacon)
|
||||
{
|
||||
if(bSendBeacon) {
|
||||
rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl|BIT6));
|
||||
pHalData->RegFwHwTxQCtrl |= BIT6;
|
||||
}
|
||||
@ -1008,8 +972,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
|
||||
//
|
||||
// Update RSVD page location H2C to Fw.
|
||||
//
|
||||
if(bcn_valid)
|
||||
{
|
||||
if(bcn_valid) {
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
|
||||
RTW_INFO("Set RSVD page location to Fw.\n");
|
||||
//FillH2CCmd88E(Adapter, H2C_88E_RSVDPAGE, H2C_RSVDPAGE_LOC_LENGTH, pMgntInfo->u1RsvdPageLoc);
|
||||
@ -1047,15 +1010,13 @@ void rtl8814_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state)
|
||||
case P2P_PS_ENABLE:
|
||||
RTW_INFO("P2P_PS_ENABLE \n");
|
||||
// update CTWindow value.
|
||||
if( pwdinfo->ctwindow > 0 )
|
||||
{
|
||||
if( pwdinfo->ctwindow > 0 ) {
|
||||
SET_8814A_H2CCMD_P2P_PS_OFFLOAD_CTWINDOW_EN(p2p_ps_offload, 1);
|
||||
rtw_write8(padapter, REG_P2P_CTWIN, pwdinfo->ctwindow);
|
||||
}
|
||||
|
||||
// hw only support 2 set of NoA
|
||||
for( i=0 ; i<pwdinfo->noa_num ; i++)
|
||||
{
|
||||
for ( i = 0 ; i<pwdinfo->noa_num ; i++) {
|
||||
// To control the register setting for which NOA
|
||||
rtw_write8(padapter, REG_NOA_DESC_SEL, (i << 4));
|
||||
if (i == 0) {
|
||||
@ -1078,21 +1039,17 @@ void rtl8814_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state)
|
||||
rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]);
|
||||
}
|
||||
|
||||
if( (pwdinfo->opp_ps == 1) || (pwdinfo->noa_num > 0) )
|
||||
{
|
||||
if( (pwdinfo->opp_ps == 1) || (pwdinfo->noa_num > 0) ) {
|
||||
// rst p2p circuit: reg 0x5F0
|
||||
rtw_write8(padapter, REG_P2P_RST_8814A, BIT(0)); //rst p2p 0 circuit NOA 0
|
||||
|
||||
SET_8814A_H2CCMD_P2P_PS_OFFLOAD_ENABLE(p2p_ps_offload, 1);
|
||||
|
||||
if(pwdinfo->role == P2P_ROLE_GO)
|
||||
{
|
||||
if (pwdinfo->role == P2P_ROLE_GO) {
|
||||
// 1: Owner, 0: Client
|
||||
SET_8814A_H2CCMD_P2P_PS_OFFLOAD_ROLE(p2p_ps_offload, 1);
|
||||
SET_8814A_H2CCMD_P2P_PS_OFFLOAD_ALLSTASLEEP(p2p_ps_offload, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// 1: Owner, 0: Client
|
||||
SET_8814A_H2CCMD_P2P_PS_OFFLOAD_ROLE(p2p_ps_offload, 0);
|
||||
}
|
||||
@ -1465,16 +1422,14 @@ void ConstructBtNullFunctionData(
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr*)pframe;
|
||||
|
||||
if (NULL == StaAddr)
|
||||
{
|
||||
if (NULL == StaAddr) {
|
||||
_rtw_memcpy(bssid, adapter_mac_addr(padapter), ETH_ALEN);
|
||||
StaAddr = bssid;
|
||||
}
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
*(fctrl) = 0;
|
||||
if (bForcePowerSave)
|
||||
{
|
||||
if (bForcePowerSave) {
|
||||
SetPwrMgt(fctrl);
|
||||
}
|
||||
|
||||
@ -1556,8 +1511,7 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter)
|
||||
CurtPktPageNum = (u8)PageNum(TxDescLen + BeaconLength, PageSize);
|
||||
|
||||
//If we don't add 1 more page, the WOWLAN function has a problem. Baron thinks it's a bug of firmware
|
||||
if (CurtPktPageNum == 1)
|
||||
{
|
||||
if (CurtPktPageNum == 1) {
|
||||
CurtPktPageNum += 1;
|
||||
}
|
||||
TotalPageNum += CurtPktPageNum;
|
||||
@ -1565,8 +1519,7 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter)
|
||||
BufIndex += (CurtPktPageNum*PageSize);
|
||||
|
||||
// Jump to lastest page
|
||||
if (BufIndex < (MaxRsvdPageBufSize - PageSize))
|
||||
{
|
||||
if (BufIndex < (MaxRsvdPageBufSize - PageSize)) {
|
||||
BufIndex = TxDescOffset + (MaxRsvdPageBufSize - PageSize);
|
||||
TotalPageNum = BCNQ_PAGE_NUM_8814-1;
|
||||
|
||||
@ -1590,14 +1543,11 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter)
|
||||
TotalPageNum += CurtPktPageNum;
|
||||
|
||||
TotalPacketLen = BufIndex + BTQosNullLength;
|
||||
if(TotalPacketLen > MaxRsvdPageBufSize)
|
||||
{
|
||||
if(TotalPacketLen > MaxRsvdPageBufSize) {
|
||||
RTW_INFO("%s(): ERROR: The rsvd page size is not enough!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n",__FUNCTION__,
|
||||
TotalPacketLen,MaxRsvdPageBufSize);
|
||||
goto error;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// update attribute
|
||||
pattrib = &pcmdframe->attrib;
|
||||
update_mgntframe_attrib(padapter, pattrib);
|
||||
@ -1673,12 +1623,10 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter)
|
||||
|
||||
DLBcnCount = 0;
|
||||
poll = 0;
|
||||
do
|
||||
{
|
||||
do {
|
||||
SetFwRsvdPagePkt_BTCoex(padapter);
|
||||
DLBcnCount++;
|
||||
do
|
||||
{
|
||||
do {
|
||||
rtw_yield_os();
|
||||
//rtw_mdelay_os(10);
|
||||
// check rsvd page download OK.
|
||||
@ -1711,8 +1659,7 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter)
|
||||
// prevent from setting 0x422[6] to 0 after download reserved page, or it will cause
|
||||
// the beacon cannot be sent by HW.
|
||||
// 2010.06.23. Added by tynli.
|
||||
if(bRecover)
|
||||
{
|
||||
if (bRecover) {
|
||||
rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl | BIT(6));
|
||||
pHalData->RegFwHwTxQCtrl |= BIT(6);
|
||||
}
|
||||
@ -1727,4 +1674,3 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter)
|
||||
}
|
||||
|
||||
#endif // CONFIG_BT_COEXIST
|
||||
|
||||
|
||||
@ -51,13 +51,10 @@ dm_CheckProtection(
|
||||
else
|
||||
RateThreshold = MGN_MCS3;
|
||||
|
||||
if(Adapter->TxStats.CurrentInitTxRate <= RateThreshold)
|
||||
{
|
||||
if(Adapter->TxStats.CurrentInitTxRate <= RateThreshold) {
|
||||
pMgntInfo->bDmDisableProtect = TRUE;
|
||||
DbgPrint("Forced disable protect: %x\n", Adapter->TxStats.CurrentInitTxRate);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
pMgntInfo->bDmDisableProtect = FALSE;
|
||||
DbgPrint("Enable protect: %x\n", Adapter->TxStats.CurrentInitTxRate);
|
||||
}
|
||||
@ -104,8 +101,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
|
||||
|
||||
if (tmp1byte == 0xff)
|
||||
return ;
|
||||
else if (tmp1byte & BIT3)
|
||||
{
|
||||
else if (tmp1byte & BIT3) {
|
||||
// Here we only set bPbcPressed to TRUE. After trigger PBC, the variable will be set to FALSE
|
||||
DBG_871X("CheckPbcGPIO - PBC is pressed\n");
|
||||
bPbcPressed = _TRUE;
|
||||
@ -113,8 +109,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
|
||||
|
||||
#endif
|
||||
|
||||
if( _TRUE == bPbcPressed)
|
||||
{
|
||||
if ( _TRUE == bPbcPressed) {
|
||||
// Here we only set bPbcPressed to true
|
||||
// After trigger PBC, the variable will be set to false
|
||||
DBG_871X("CheckPbcGPIO - PBC is pressed\n");
|
||||
@ -145,7 +140,6 @@ dm_InterruptMigration(
|
||||
BOOLEAN IntMtToSet = _FALSE;
|
||||
BOOLEAN ACIntToSet = _FALSE;
|
||||
|
||||
|
||||
// Retrieve current interrupt migration and Tx four ACs IMR settings first.
|
||||
bCurrentIntMt = pHalData->bInterruptMigration;
|
||||
bCurrentACIntDisable = pHalData->bDisableTxInt;
|
||||
@ -168,8 +162,7 @@ dm_InterruptMigration(
|
||||
//Update current settings.
|
||||
if ( bCurrentIntMt != IntMtToSet ) {
|
||||
DBG_8192C("%s(): Update interrrupt migration(%d)\n",__FUNCTION__,IntMtToSet);
|
||||
if(IntMtToSet)
|
||||
{
|
||||
if(IntMtToSet) {
|
||||
//
|
||||
// <Roger_Notes> Set interrrupt migration timer and corresponging Tx/Rx counter.
|
||||
// timer 25ns*0xfa0=100us for 0xf packets.
|
||||
@ -177,9 +170,7 @@ dm_InterruptMigration(
|
||||
//
|
||||
rtw_write32(Adapter, REG_INT_MIG, 0xff000fa0);// 0x306:Rx, 0x307:Tx
|
||||
pHalData->bInterruptMigration = IntMtToSet;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Reset all interrupt migration settings.
|
||||
rtw_write32(Adapter, REG_INT_MIG, 0);
|
||||
pHalData->bInterruptMigration = IntMtToSet;
|
||||
@ -400,8 +391,7 @@ rtl8814_HalDmWatchDog(
|
||||
}
|
||||
|
||||
//ODM
|
||||
if (rtw_is_hw_init_completed(Adapter))
|
||||
{
|
||||
if (rtw_is_hw_init_completed(Adapter)) {
|
||||
u8 bLinked=_FALSE;
|
||||
u8 bsta_state=_FALSE;
|
||||
u8 bBtDisabled = _TRUE;
|
||||
@ -488,13 +478,11 @@ void AntDivCompare8814(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src)
|
||||
//PADAPTER Adapter = pDM_Odm->Adapter ;
|
||||
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
if(0 != pHalData->AntDivCfg )
|
||||
{
|
||||
if (0 != pHalData->AntDivCfg ) {
|
||||
//DBG_8192C("update_network=> orgRSSI(%d)(%d),newRSSI(%d)(%d)\n",dst->Rssi,query_rx_pwr_percentage(dst->Rssi),
|
||||
// src->Rssi,query_rx_pwr_percentage(src->Rssi));
|
||||
//select optimum_antenna for before linked =>For antenna diversity
|
||||
if(dst->Rssi >= src->Rssi )//keep org parameter
|
||||
{
|
||||
if (dst->Rssi >= src->Rssi ) { //keep org parameter
|
||||
src->Rssi = dst->Rssi;
|
||||
src->PhyInfo.Optimum_antenna = dst->PhyInfo.Optimum_antenna;
|
||||
}
|
||||
@ -511,14 +499,12 @@ u8 AntDivBeforeLink8814(PADAPTER Adapter )
|
||||
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
|
||||
|
||||
// Condition that does not need to use antenna diversity.
|
||||
if(pHalData->AntDivCfg==0)
|
||||
{
|
||||
if (pHalData->AntDivCfg==0) {
|
||||
//DBG_8192C("odm_AntDivBeforeLink8192C(): No AntDiv Mechanism.\n");
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
@ -532,13 +518,10 @@ u8 AntDivBeforeLink8814(PADAPTER Adapter )
|
||||
rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE);
|
||||
//DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==MAIN_ANT)?"MAIN":"AUX");
|
||||
return _TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
pDM_SWAT_Table->SWAS_NoLink_State = 0;
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
}
|
||||
#endif //CONFIG_ANTENNA_DIVERSITY
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -42,8 +42,7 @@ PHY_RF6052SetBandwidth8814A(
|
||||
IN PADAPTER Adapter,
|
||||
IN CHANNEL_WIDTH Bandwidth) //20M or 40M
|
||||
{
|
||||
switch(Bandwidth)
|
||||
{
|
||||
switch (Bandwidth) {
|
||||
case CHANNEL_WIDTH_20:
|
||||
/*RTW_INFO("PHY_RF6052SetBandwidth8814A(), set 20MHz\n");*/
|
||||
PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW_Jaguar, BIT11|BIT10, 3);
|
||||
@ -101,11 +100,9 @@ phy_RF6052_Config_ParaFile_8814A(
|
||||
//3// <2> Initialize RF
|
||||
//3//-----------------------------------------------------------------
|
||||
//for(eRFPath = RF_PATH_A; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
|
||||
for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
|
||||
{
|
||||
for (eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) {
|
||||
/*----Initialize RF fom connfiguration file----*/
|
||||
switch(eRFPath)
|
||||
{
|
||||
switch (eRFPath) {
|
||||
case RF_PATH_A:
|
||||
#ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
|
||||
if (PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, eRFPath) == _FAIL)
|
||||
@ -185,7 +182,6 @@ phy_RF6052_Config_ParaFile_Fail:
|
||||
return rtStatus;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
PHY_RF6052_Config_8814A(
|
||||
IN PADAPTER Adapter)
|
||||
@ -205,6 +201,4 @@ PHY_RF6052_Config_8814A(
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* End of HalRf6052.c */
|
||||
|
||||
|
||||
@ -111,4 +111,3 @@ void rtl8814_sreset_linked_status_check(_adapter *padapter)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@ -197,8 +197,7 @@ void UpdateEarlyModeInfo8814(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitb
|
||||
}
|
||||
#endif
|
||||
|
||||
if( pframe->agg_num > EARLY_MODE_MAX_PKT_NUM)
|
||||
{
|
||||
if ( pframe->agg_num > EARLY_MODE_MAX_PKT_NUM) {
|
||||
node_num_0 = pframe->agg_num;
|
||||
node_num_1= EARLY_MODE_MAX_PKT_NUM-1;
|
||||
}
|
||||
@ -213,13 +212,11 @@ void UpdateEarlyModeInfo8814(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitb
|
||||
if (node_num_0 > EARLY_MODE_MAX_PKT_NUM) {
|
||||
eminfo.EMPktNum = EARLY_MODE_MAX_PKT_NUM;
|
||||
node_num_0--;
|
||||
}
|
||||
else{
|
||||
} else{
|
||||
eminfo.EMPktNum = node_num_1;
|
||||
node_num_1--;
|
||||
}
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
eminfo.EMPktNum = pframe->agg_num-(index+1);
|
||||
}
|
||||
for (j = 0;j< eminfo.EMPktNum ;j++) {
|
||||
@ -230,8 +227,7 @@ void UpdateEarlyModeInfo8814(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitb
|
||||
if (index==0) {
|
||||
ptxdesc = (PTXDESC_8814)(pmem);
|
||||
pEMInfo_mem = ((u8 *)ptxdesc)+TXDESC_SIZE;
|
||||
}
|
||||
else{
|
||||
} else{
|
||||
pmem = pmem + pxmitpriv->agg_pkt[index-1].offset;
|
||||
ptxdesc = (PTXDESC_8814)(pmem);
|
||||
pEMInfo_mem = ((u8 *)ptxdesc)+TXDESC_SIZE;
|
||||
@ -310,17 +306,13 @@ void rtl8814a_fill_fake_txdesc(
|
||||
}
|
||||
|
||||
//Set NAVUSEHDR to prevent Ps-poll AId filed to be changed to error vlaue by Hw.
|
||||
if (IsPsPoll)
|
||||
{
|
||||
if (IsPsPoll) {
|
||||
SET_TX_DESC_NAV_USE_HDR_8814A(pDesc, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
SET_TX_DESC_HWSEQ_EN_8814A(pDesc, 1); // Hw set sequence number
|
||||
}
|
||||
#if 0 //todo
|
||||
if(IsBTQosNull)
|
||||
{
|
||||
if (IsBTQosNull) {
|
||||
SET_TX_DESC_BT_INT_8812(pDesc, 1);
|
||||
}
|
||||
#endif //0
|
||||
@ -333,13 +325,11 @@ void rtl8814a_fill_fake_txdesc(
|
||||
//
|
||||
// Encrypt the data frame if under security mode excepct null data. Suggested by CCW.
|
||||
//
|
||||
if (_TRUE ==bDataFrame)
|
||||
{
|
||||
if (_TRUE ==bDataFrame) {
|
||||
u32 EncAlg;
|
||||
|
||||
EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
|
||||
switch (EncAlg)
|
||||
{
|
||||
switch (EncAlg) {
|
||||
case _NO_PRIVACY_:
|
||||
SET_TX_DESC_SEC_TYPE_8814A(pDesc, 0x0);
|
||||
break;
|
||||
@ -370,10 +360,8 @@ void rtl8814a_fill_fake_txdesc(
|
||||
|
||||
void rtl8814a_fill_txdesc_sectype(struct pkt_attrib *pattrib, u8 *ptxdesc)
|
||||
{
|
||||
if ((pattrib->encrypt > 0) && !pattrib->bswenc)
|
||||
{
|
||||
switch (pattrib->encrypt)
|
||||
{
|
||||
if ((pattrib->encrypt > 0) && !pattrib->bswenc) {
|
||||
switch (pattrib->encrypt) {
|
||||
//SEC_TYPE : 0:NO_ENC,1:WEP40/TKIP,2:WAPI,3:AES
|
||||
case _WEP40_:
|
||||
case _WEP104_:
|
||||
@ -409,8 +397,7 @@ void rtl8814a_fill_txdesc_vcs(PADAPTER padapter, struct pkt_attrib *pattrib, u8
|
||||
|
||||
if (pattrib->vcs_mode) {
|
||||
|
||||
switch(pattrib->vcs_mode)
|
||||
{
|
||||
switch (pattrib->vcs_mode) {
|
||||
case RTS_CTS:
|
||||
SET_TX_DESC_RTS_ENABLE_8814A(ptxdesc, 1);
|
||||
break;
|
||||
@ -444,8 +431,7 @@ BWMapping_8814(
|
||||
|
||||
//RTW_INFO("BWMapping pHalData->CurrentChannelBW %d, pattrib->bwmode %d \n",pHalData->CurrentChannelBW,pattrib->bwmode);
|
||||
|
||||
if(pHalData->CurrentChannelBW== CHANNEL_WIDTH_80)
|
||||
{
|
||||
if (pHalData->CurrentChannelBW== CHANNEL_WIDTH_80) {
|
||||
if (pattrib->bwmode == CHANNEL_WIDTH_80)
|
||||
BWSettingOfDesc= 2;
|
||||
else if (pattrib->bwmode == CHANNEL_WIDTH_40)
|
||||
@ -453,8 +439,7 @@ BWMapping_8814(
|
||||
else
|
||||
BWSettingOfDesc = 0;
|
||||
}
|
||||
else if(pHalData->CurrentChannelBW== CHANNEL_WIDTH_40)
|
||||
{
|
||||
else if(pHalData->CurrentChannelBW== CHANNEL_WIDTH_40) {
|
||||
if ((pattrib->bwmode == CHANNEL_WIDTH_40) || (pattrib->bwmode == CHANNEL_WIDTH_80))
|
||||
BWSettingOfDesc = 1;
|
||||
else
|
||||
@ -476,23 +461,18 @@ SCMapping_8814(
|
||||
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
|
||||
//RTW_INFO("SCMapping: pHalData->CurrentChannelBW %d, pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d \n",pHalData->CurrentChannelBW,pHalData->nCur80MhzPrimeSC,pHalData->nCur40MhzPrimeSC);
|
||||
|
||||
if(pHalData->CurrentChannelBW == CHANNEL_WIDTH_80)
|
||||
{
|
||||
if(pattrib->bwmode == CHANNEL_WIDTH_80)
|
||||
{
|
||||
if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
|
||||
if (pattrib->bwmode == CHANNEL_WIDTH_80) {
|
||||
SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
|
||||
}
|
||||
else if(pattrib->bwmode == CHANNEL_WIDTH_40)
|
||||
{
|
||||
else if (pattrib->bwmode == CHANNEL_WIDTH_40) {
|
||||
if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
|
||||
SCSettingOfDesc = VHT_DATA_SC_40_LOWER_OF_80MHZ;
|
||||
else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
|
||||
SCSettingOfDesc = VHT_DATA_SC_40_UPPER_OF_80MHZ;
|
||||
else
|
||||
RTW_INFO("SCMapping: DONOT CARE Mode Setting\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER))
|
||||
SCSettingOfDesc = VHT_DATA_SC_20_LOWEST_OF_80MHZ;
|
||||
else if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER))
|
||||
@ -505,33 +485,23 @@ SCMapping_8814(
|
||||
RTW_INFO("SCMapping: DONOT CARE Mode Setting\n");
|
||||
}
|
||||
}
|
||||
else if(pHalData->CurrentChannelBW== CHANNEL_WIDTH_40)
|
||||
{
|
||||
else if (pHalData->CurrentChannelBW== CHANNEL_WIDTH_40) {
|
||||
//RTW_INFO("SCMapping: HT Case: pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d \n",pHalData->CurrentChannelBW,pHalData->nCur40MhzPrimeSC);
|
||||
|
||||
if(pattrib->bwmode == CHANNEL_WIDTH_40)
|
||||
{
|
||||
if (pattrib->bwmode == CHANNEL_WIDTH_40) {
|
||||
SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
|
||||
}
|
||||
else if(pattrib->bwmode == CHANNEL_WIDTH_20)
|
||||
{
|
||||
if(pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
|
||||
{
|
||||
else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
|
||||
if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) {
|
||||
SCSettingOfDesc = VHT_DATA_SC_20_UPPER_OF_80MHZ;
|
||||
}
|
||||
else if(pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
|
||||
{
|
||||
else if(pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) {
|
||||
SCSettingOfDesc = VHT_DATA_SC_20_LOWER_OF_80MHZ;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
|
||||
}
|
||||
|
||||
@ -543,13 +513,10 @@ void rtl8814a_fill_txdesc_phy(PADAPTER padapter, struct pkt_attrib *pattrib, u8
|
||||
{
|
||||
//RTW_INFO("bwmode=%d, ch_off=%d\n", pattrib->bwmode, pattrib->ch_offset);
|
||||
|
||||
if(pattrib->ht_en)
|
||||
{
|
||||
if (pattrib->ht_en) {
|
||||
// Set Bandwidth and sub-channel settings.
|
||||
SET_TX_DESC_DATA_BW_8814A(ptxdesc, BWMapping_8814(padapter,pattrib));
|
||||
|
||||
SET_TX_DESC_DATA_SC_8814A(ptxdesc, SCMapping_8814(padapter,pattrib));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -144,4 +144,3 @@ rtl8814au_DeInitSwLeds(
|
||||
DeInitLed( &(ledpriv->SwLed1) );
|
||||
DeInitLed( &(ledpriv->SwLed2) );
|
||||
}
|
||||
|
||||
|
||||
@ -31,4 +31,3 @@ void rtl8814au_free_recv_priv(_adapter *padapter)
|
||||
{
|
||||
usb_free_recv_priv(padapter, INTERRUPT_MSG_FORMAT_LEN);
|
||||
}
|
||||
|
||||
|
||||
@ -60,10 +60,8 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
u8 DriverFixedRate = 0x0;
|
||||
|
||||
#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX
|
||||
if (padapter->registrypriv.mp_mode == 0)
|
||||
{
|
||||
if((PACKET_OFFSET_SZ != 0) && (!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==_FALSE))
|
||||
{
|
||||
if (padapter->registrypriv.mp_mode == 0) {
|
||||
if((PACKET_OFFSET_SZ != 0) && (!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==_FALSE)) {
|
||||
ptxdesc = (pmem+PACKET_OFFSET_SZ);
|
||||
//RTW_INFO("==> non-agg-pkt,shift pointer...\n");
|
||||
pull = 1;
|
||||
@ -164,8 +162,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
SET_TX_DESC_MAX_AGG_NUM_8814A(ptxdesc, 0x1f);
|
||||
// Set A-MPDU aggregation.
|
||||
SET_TX_DESC_AMPDU_DENSITY_8814A(ptxdesc, pattrib->ampdu_spacing);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
SET_TX_DESC_BK_8814A(ptxdesc, 1);
|
||||
}
|
||||
|
||||
@ -173,12 +170,9 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
|
||||
//DATA Rate FB LMT
|
||||
//SET_TX_DESC_DATA_RATE_FB_LIMIT_8814A(ptxdesc, 0x1f);
|
||||
if(pHalData->CurrentBandType == BAND_ON_5G)
|
||||
{
|
||||
if (pHalData->CurrentBandType == BAND_ON_5G) {
|
||||
SET_TX_DESC_DATA_RATE_FB_LIMIT_8814A(ptxdesc, 4);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
SET_TX_DESC_DATA_RATE_FB_LIMIT_8814A(ptxdesc, 0);
|
||||
}
|
||||
|
||||
@ -211,9 +205,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
//work arond before fixing RA
|
||||
//SET_TX_DESC_USE_RATE_8814A(ptxdesc, 1);
|
||||
//SET_TX_DESC_TX_RATE_8814A(ptxdesc, 0x10);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// EAP data packet and ARP packet and DHCP.
|
||||
// Use the 1M data rate to send the EAP/ARP packet.
|
||||
// This will maybe make the handshake smooth.
|
||||
@ -231,8 +223,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
}
|
||||
|
||||
}
|
||||
else if((pxmitframe->frame_tag&0x0f)== MGNT_FRAMETAG)
|
||||
{
|
||||
else if ((pxmitframe->frame_tag&0x0f)== MGNT_FRAMETAG) {
|
||||
//RTW_INFO("pxmitframe->frame_tag == MGNT_FRAMETAG\n");
|
||||
|
||||
SET_TX_DESC_USE_RATE_8814A(ptxdesc, 1);
|
||||
@ -270,9 +261,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
{
|
||||
SET_TX_DESC_NDPA_8814A(ptxdesc, 1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
SET_TX_DESC_RETRY_LIMIT_ENABLE_8814A(ptxdesc, 1);
|
||||
if (pattrib->retry_ctrl == _TRUE) {
|
||||
SET_TX_DESC_DATA_RETRY_LIMIT_8814A(ptxdesc, 6);
|
||||
@ -291,8 +280,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
||||
}
|
||||
#endif //CONFIG_XMIT_ACK
|
||||
}
|
||||
else if((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG)
|
||||
{
|
||||
else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG) {
|
||||
RTW_INFO("pxmitframe->frame_tag == TXAGG_FRAMETAG\n");
|
||||
}
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
@ -438,36 +426,29 @@ static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
|
||||
|
||||
//RTW_INFO("rtw_dump_xframe()\n");
|
||||
|
||||
for (t = 0; t < pattrib->nr_frags; t++)
|
||||
{
|
||||
for (t = 0; t < pattrib->nr_frags; t++) {
|
||||
if (inner_ret != _SUCCESS && ret == _SUCCESS)
|
||||
ret = _FAIL;
|
||||
|
||||
if (t != (pattrib->nr_frags - 1))
|
||||
{
|
||||
if (t != (pattrib->nr_frags - 1)) {
|
||||
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("pattrib->nr_frags=%d\n", pattrib->nr_frags));
|
||||
|
||||
sz = pxmitpriv->frag_len;
|
||||
sz = sz - 4 - (psecuritypriv->sw_encrypt ? 0 : pattrib->icv_len);
|
||||
}
|
||||
else //no frag
|
||||
{
|
||||
} else { //no frag
|
||||
sz = pattrib->last_txcmdsz;
|
||||
}
|
||||
|
||||
pull = update_txdesc(pxmitframe, mem_addr, sz, _FALSE);
|
||||
|
||||
if(pull)
|
||||
{
|
||||
if (pull) {
|
||||
mem_addr += PACKET_OFFSET_SZ; //pull txdesc head
|
||||
|
||||
//pxmitbuf ->pbuf = mem_addr;
|
||||
pxmitframe->buf_addr = mem_addr;
|
||||
|
||||
w_sz = sz + TXDESC_SIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
w_sz = sz + TXDESC_SIZE + PACKET_OFFSET_SZ;
|
||||
}
|
||||
|
||||
@ -679,8 +660,7 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
||||
xmitframe_phead = get_list_head(&ptxservq->sta_pending);
|
||||
xmitframe_plist = get_next(xmitframe_phead);
|
||||
|
||||
while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == _FALSE)
|
||||
{
|
||||
while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == _FALSE) {
|
||||
pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list);
|
||||
xmitframe_plist = get_next(xmitframe_plist);
|
||||
|
||||
@ -842,11 +822,9 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
||||
|
||||
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete()\n"));
|
||||
|
||||
if(pxmitbuf==NULL)
|
||||
{
|
||||
if (pxmitbuf==NULL) {
|
||||
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
|
||||
if(!pxmitbuf)
|
||||
{
|
||||
if (!pxmitbuf) {
|
||||
return _FALSE;
|
||||
}
|
||||
}
|
||||
@ -855,18 +833,15 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
||||
{
|
||||
pxmitframe = rtw_dequeue_xframe(pxmitpriv, phwxmits, hwentry);
|
||||
|
||||
if(pxmitframe)
|
||||
{
|
||||
if (pxmitframe) {
|
||||
pxmitframe->pxmitbuf = pxmitbuf;
|
||||
|
||||
pxmitframe->buf_addr = pxmitbuf->pbuf;
|
||||
|
||||
pxmitbuf->priv_data = pxmitframe;
|
||||
|
||||
if((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG)
|
||||
{
|
||||
if(pxmitframe->attrib.priority<=15)//TID0~15
|
||||
{
|
||||
if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) {
|
||||
if (pxmitframe->attrib.priority<=15) { //TID0~15
|
||||
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
}
|
||||
//RTW_INFO("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority);
|
||||
@ -875,21 +850,16 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
|
||||
|
||||
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);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
|
||||
rtw_free_xmitframe(pxmitpriv, pxmitframe);
|
||||
}
|
||||
|
||||
xcnt++;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
|
||||
return _FALSE;
|
||||
}
|
||||
@ -911,8 +881,7 @@ static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
|
||||
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
|
||||
if (res == _SUCCESS) {
|
||||
rtw_dump_xframe(padapter, pxmitframe);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
RTW_INFO("==> %s xmitframe_coalsece failed\n",__FUNCTION__);
|
||||
}
|
||||
|
||||
@ -936,8 +905,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
|
||||
|
||||
_enter_critical_bh(&pxmitpriv->lock, &irqL);
|
||||
|
||||
if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0)
|
||||
{
|
||||
if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) {
|
||||
//RTW_INFO("enqueue AC(%d)\n",pattrib->priority);
|
||||
goto enqueue;
|
||||
}
|
||||
@ -1000,14 +968,11 @@ s32 rtl8814au_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmi
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
s32 err;
|
||||
|
||||
if ((err=rtw_xmitframe_enqueue(padapter, pxmitframe)) != _SUCCESS)
|
||||
{
|
||||
if ((err=rtw_xmitframe_enqueue(padapter, pxmitframe)) != _SUCCESS) {
|
||||
rtw_free_xmitframe(pxmitpriv, pxmitframe);
|
||||
|
||||
pxmitpriv->tx_drop++;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
#ifdef PLATFORM_LINUX
|
||||
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
|
||||
#endif
|
||||
@ -1079,8 +1044,7 @@ s32 rtl8814au_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
|
||||
ptxdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE+OFFSET_SZ)<<OFFSET_SHT)&0x00ff0000);//default = 32 bytes for TX Desc
|
||||
ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG);
|
||||
|
||||
if(bmcst)
|
||||
{
|
||||
if (bmcst) {
|
||||
ptxdesc->txdw0 |= cpu_to_le32(BIT(24));
|
||||
}
|
||||
|
||||
|
||||
@ -796,12 +796,15 @@ check_bss:
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
|
||||
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
||||
#endif
|
||||
|
||||
if (NULL != pmlmepriv->assoc_req && NULL != pmlmepriv->assoc_rsp)
|
||||
cfg80211_connect_result(padapter->pnetdev, cur_network->network.MacAddress
|
||||
, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
|
||||
, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
|
||||
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
|
||||
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
|
||||
, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
|
||||
RTW_INFO("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user