Merge tag 'v4.14.1' into mptcp_v0.94

v4.14.1
multipath-tcp · Mar 9, 2018 · 64fc462 · 64fc462
2 parents 8d27554 + 212b522
commit 64fc462
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
@@ -1 +1 @@
-static const char SNAPSHOT[] = "171112";
+static const char SNAPSHOT[] = "171113";
diff --git 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))
 

diff --git a/lib/utils.c b/lib/utils.c
@@ -31,7 +31,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <ctype.h>
 
 #include "rt_names.h"
 #include "utils.h"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		static const char SNAPSHOT[] = "171112";
		static const char SNAPSHOT[] = "171113";