Merge pull request #107 from MilhouseVH/fix-4.20-rc1

Fix build with 4.20-rc1
This commit is contained in:
Carlos Garcés 2018-11-12 09:46:40 +01:00 committed by GitHub
commit 6315416908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -357,7 +357,9 @@ rtw_cfg80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
static u64 rtw_get_systime_us(void)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
return ktime_to_us(ktime_get_boottime());
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
struct timespec ts;
get_monotonic_boottime(&ts);
return ((u64)ts.tv_sec*1000000) + ts.tv_nsec / 1000;