[Linuxptp-devel] [PATCH 1/2] fixed include order to work around issue on RHEL 6.6 Signed-off-by: Brian Olson <[e-mail]>

[Brian Olson]

---
rtnl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rtnl.c b/rtnl.c
index 251b5f3..db98629 100644
--- a/rtnl.c
+++ b/rtnl.c
@@ -17,13 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <asm/types.h>
+#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <net/if.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
#include <unistd.h>

#include "print.h"

[Brian Olson]

---
clockadj.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/clockadj.c b/clockadj.c
index 5eb7cce..86c7b33 100644
--- a/clockadj.c
+++ b/clockadj.c
@@ -73,7 +73,7 @@ double clockadj_get_freq(clockid_t clkid)
pr_err("failed to read out the clock frequency adjustment: %m");
} else {
f = tx.freq / 65.536;
- if (clkid == CLOCK_REALTIME && realtime_nominal_tick)
+ if (clkid == CLOCK_REALTIME && realtime_nominal_tick && tx.tick)
f += 1e3 * realtime_hz * (tx.tick - realtime_nominal_tick);
}
return f;

[Richard Cochran]

Post by Brian Olson
---
clockadj.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

Applied.

Thanks,
Richard

[Richard Cochran]

Post by Brian Olson
---
rtnl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

Applied, fixing up the SOB and adding a comment so as not to forget
the ordering requirements.

Thanks,
Richard