From 3cd5b54b542e45912271c46274b049df93b6a7f8 Mon Sep 17 00:00:00 2001
From: Christopher Hall <christopher.s.hall@intel.com>
Date: Tue, 10 Oct 2017 06:57:57 -0400
Subject: Simplifies timeval & timespec redefinition fix

---
 daemons/gptp/linux/src/linux_hal_generic_adj.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/daemons/gptp/linux/src/linux_hal_generic_adj.cpp b/daemons/gptp/linux/src/linux_hal_generic_adj.cpp
index ff445f68..7f1d59c8 100644
--- a/daemons/gptp/linux/src/linux_hal_generic_adj.cpp
+++ b/daemons/gptp/linux/src/linux_hal_generic_adj.cpp
@@ -31,13 +31,8 @@
 
 ******************************************************************************/
 
-#include <linux/timex.h>
-// linux_hal_generic.hpp pulls in redefinition of struct timespec and timeval
-// Below are defines that prevent this:
-#define _TIME_H  1
-#define _STRUCT_TIMEVAL 1
-#define __timeval_defined 1
-#define __timespec_defined 1
+#include <sys/timex.h>
+#define ADJ_SETOFFSET 0x0100 // Missing from older header files
 #include <linux_hal_generic.hpp>
 #include <syscall.h>
 #include <math.h>
-- 
cgit v1.2.1


From ba94f00b69e8f235fb4d8994e0db8ab04a5717f0 Mon Sep 17 00:00:00 2001
From: Christopher Hall <christopher.s.hall@intel.com>
Date: Tue, 10 Oct 2017 08:48:13 -0400
Subject: Fix incorrect return value check in lock initialize

---
 daemons/gptp/linux/src/linux_hal_common.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemons/gptp/linux/src/linux_hal_common.hpp b/daemons/gptp/linux/src/linux_hal_common.hpp
index 28332f01..9eb3ddc9 100644
--- a/daemons/gptp/linux/src/linux_hal_common.hpp
+++ b/daemons/gptp/linux/src/linux_hal_common.hpp
@@ -306,7 +306,7 @@ public:
 	OSLock * createLock( OSLockType type ) const
 	{
 		LinuxLock *lock = new LinuxLock();
-		if (lock->initialize(type) != oslock_ok) {
+		if (!lock->initialize(type)) {
 			delete lock;
 			lock = NULL;
 		}
-- 
cgit v1.2.1