From 91e6a638e13811bf4d2e45bc09cd6681f3dd9bbc Mon Sep 17 00:00:00 2001
From: kimocoder <christianbremvaag@gmail.com>
Date: Mon, 27 Aug 2018 19:52:40 +0200
Subject: [PATCH] Drop date & time from version dump, to allow reproducible
 builds

---
 core/rtw_debug.c        | 2 +-
 core/rtw_mp.c           | 8 ++++----
 dkms.conf               | 2 +-
 include/rtw_mp.h        | 3 +--
 os_dep/linux/ioctl_mp.c | 3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index cc78334..6eb77e9 100644
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -42,7 +42,7 @@ const char *rtw_log_level_str[] = {
 void dump_drv_version(void *sel)
 {
 	RTW_PRINT_SEL(sel, "%s %s\n", DRV_NAME, DRIVERVERSION);
-	RTW_PRINT_SEL(sel, "build time: %s %s\n", __DATE__, __TIME__);
+	// RTW_PRINT_SEL(sel, "build time: %s %s\n", __DATE__, __TIME__);
 }
 
 void dump_drv_cfg(void *sel)
diff --git a/core/rtw_mp.c b/core/rtw_mp.c
index 949bcf0..564be07 100644
--- a/core/rtw_mp.c
+++ b/core/rtw_mp.c
@@ -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,
diff --git a/dkms.conf b/dkms.conf
index 0f56eaf..ab54802 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl88xxau"
-PACKAGE_VERSION="5.2.20.2~20180826"
+PACKAGE_VERSION="5.2.20.2~20180827"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=88XXau
 PROCS_NUM=`nproc`
diff --git a/include/rtw_mp.h b/include/rtw_mp.h
index 2493e5c..d3805e9 100644
--- a/include/rtw_mp.h
+++ b/include/rtw_mp.h
@@ -761,7 +761,6 @@ 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,
@@ -778,7 +777,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);
diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/linux/ioctl_mp.c
index 4243633..eacd685 100644
--- a/os_dep/linux/ioctl_mp.c
+++ b/os_dep/linux/ioctl_mp.c
@@ -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,7 +1625,6 @@ 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);