From 487bf4d30d1b8ef897c25dbba74933c36c43efd4 Mon Sep 17 00:00:00 2001 From: Carl Huth Date: Fri, 24 Nov 2017 21:46:32 -0500 Subject: [PATCH] updates or Ubuntu 16.04 compatibility --- os/linux/rt_linux.c | 4 ++++ sta/sta_cfg.c | 2 +- tools/bin2h | Bin 16609 -> 16544 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/os/linux/rt_linux.c b/os/linux/rt_linux.c index 7b10cee..a0f6ed8 100644 --- a/os/linux/rt_linux.c +++ b/os/linux/rt_linux.c @@ -1134,6 +1134,10 @@ static inline void __RtmpOSFSInfoChange(OS_FS_INFO * pOSFSInfo, pOSFSInfo->fsuid = current->fsuid; pOSFSInfo->fsgid = current->fsgid; current->fsuid = current->fsgid = 0; +#endif +#if LINUX_VERSION_CODE > KERNEL_VERSION(4,4,0) + pOSFSInfo->fsuid = current_fsuid().val; + pOSFSInfo->fsgid = current_fsgid().val; #else pOSFSInfo->fsuid = current_fsuid(); pOSFSInfo->fsgid = current_fsgid(); diff --git a/sta/sta_cfg.c b/sta/sta_cfg.c index 89b2579..f10e1cc 100644 --- a/sta/sta_cfg.c +++ b/sta/sta_cfg.c @@ -4902,7 +4902,7 @@ VOID RTMPIoctlShow( wrq->u.data.length = strlen(extra) + 1; /* 1: size of '\0' */ break; case SHOW_DRVIER_VERION: - snprintf(extra, size, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); + snprintf(extra, size, "Driver version-%s\n", STA_DRIVER_VERSION); wrq->u.data.length = strlen(extra) + 1; /* 1: size of '\0' */ break; #ifdef DOT11_N_SUPPORT diff --git a/tools/bin2h b/tools/bin2h index cdf07b89746b4b7f3a3a8dca65aaaabaee63766f..2cc4de8b8844adeaeeb770b3a60b287479d6de1b 100755 GIT binary patch literal 16544 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