Merge branch 'master' into net-next

2017-11-13 10:35:17 -08:00 · 2017-11-13 10:35:17 -08:00 · a60742aaf4
parent 9edf7016e8 212b52299e
commit a60742aaf4
3 changed files with 5 additions and 2 deletions
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@ -1 +1 @@
-static const char SNAPSHOT[] = "171112";
+static const char SNAPSHOT[] = "171113";
--- a/ip/xfrm.h
+++ b/ip/xfrm.h
@ -30,6 +30,10 @@
 #include <linux/xfrm.h>
 #include <linux/ipsec.h>

+#ifndef IPPROTO_MH
+#define IPPROTO_MH              135
+#endif
+
 #define XFRMS_RTA(x)  ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info))))
 #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info))

--- a/lib/utils.c
+++ b/lib/utils.c
@ -30,7 +30,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <ctype.h>

 #include "rt_names.h"
 #include "utils.h"