diff --git a/include/rtw_version.h b/include/rtw_version.h index c2a1fe2..3faabc0 100644 --- a/include/rtw_version.h +++ b/include/rtw_version.h @@ -1,2 +1,2 @@ -#define DRIVERVERSION "v4.3.22.9_16440.20151221_BTCOEX20151214-0700-ICE02" +#define DRIVERVERSION "v4.3.22.9_16440.20151221_BTCOEX20151214-0700-ICE03" #define BTCOEXVERSION "BTCOEX20151214-0700" diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 4b44a78..8251444 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -347,7 +347,11 @@ 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)) + struct timespec64 ts; + ktime_get_boottime_ts64(&ts); + return ((u64)ts.tv_sec*1000000) + ts.tv_nsec / 1000; +#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;