1
0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2025-01-08 09:35:08 +00:00

Merge pull request #186 from kimocoder/v5.2.20

Fix for ARM build (testing)
This commit is contained in:
Christian B 2018-08-26 15:37:50 +02:00 committed by GitHub
commit 00aac0bbbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions

View File

@ -2787,7 +2787,7 @@ void CRC16_generator(
}
#if !(defined(__arm__) || defined(__aarch64__)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
/*========================================
SFD SIGNAL SERVICE LENGTH CRC
16 bit 8 bit 8 bit 16 bit 16 bit
@ -2867,7 +2867,7 @@ void CCK_generator(
ByteToBit(pPMacTxInfo->CRC16, crc16_out, 2);
}
#endif
void PMAC_Get_Pkt_Param(
PRT_PMAC_TX_INFO pPMacTxInfo,
@ -2940,7 +2940,7 @@ void PMAC_Get_Pkt_Param(
pPMacTxInfo->m_STBC = 1;
}
#if !(defined(__arm__) || defined(__aarch64__)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
UINT LDPC_parameter_generator(
UINT N_pld_int,
UINT N_CBPSS,
@ -3286,7 +3286,7 @@ void L_SIG_generator(
_rtw_memset(pPMacTxInfo->LSIG, 0, 3);
ByteToBit(pPMacTxInfo->LSIG, (bool *)sig_bi, 3);
}
#endif
void CRC8_generator(
bool *out,

View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.2.20.2~20180812"
PACKAGE_VERSION="5.2.20.2~20180826"
CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc`

View File

@ -761,6 +761,7 @@ PMAC_Get_Pkt_Param(
PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo
);
#if !(defined(__arm__) || defined(__aarch64__)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
void
CCK_generator(
PRT_PMAC_TX_INFO pPMacTxInfo,
@ -777,7 +778,7 @@ L_SIG_generator(
PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo
);
#endif
void HT_SIG_generator(
PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo);

View File

@ -1616,7 +1616,7 @@ int rtw_mp_tx(struct net_device *dev,
_rtw_memset(pMptCtx->PMacTxInfo.MacAddress, 0xFF, ETH_ALEN);
PMAC_Get_Pkt_Param(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
#if !(defined(__arm__) || defined(__aarch64__)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
if (MPT_IS_CCK_RATE(pMptCtx->PMacTxInfo.TX_RATE))
CCK_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
@ -1625,6 +1625,7 @@ int rtw_mp_tx(struct net_device *dev,
/* 24 BIT*/
L_SIG_generator(pMptCtx->PMacPktInfo.N_sym, &pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);
}
#endif
/* 48BIT*/
if (MPT_IS_HT_RATE(pMptCtx->PMacTxInfo.TX_RATE))
HT_SIG_generator(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo);