X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fcompat.h;h=c484a5d72a6c991586916c6b64bef70b9cb6b869;hb=de06dce673979eb9208c539bad15fae855e1d4c5;hp=12100ae396b024a56ee7130d4e66d698b46ef00a;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/datapath/compat.h b/datapath/compat.h
index 12100ae3..c484a5d7 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -1,17 +1,39 @@
+/*
+ * Copyright (c) 2011 Nicira Networks.
+ * Distributed under the terms of the GNU GPL version 2.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
+ */
+
 #ifndef COMPAT_H
 #define COMPAT_H 1
 
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <linux/netlink.h>
 
-#include "compat26.h"
+#ifndef HAVE_NLA_NUL_STRING
+static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
+{
+	char *s;
+	int len;
+	if (!attr)
+		return 0;
 
-#else
+	len = nla_len(attr);
+	if (len >= maxlen)
+		return -EINVAL;
 
-#include "compat24.h"
-
-#endif
+	s = nla_data(attr);
+	if (s[len - 1] != '\0')
+		return -EINVAL;
 
+	return 0;
+}
+#else
+static inline int CHECK_NUL_STRING(struct nlattr *attr, int maxlen)
+{
+	return 0;
+}
+#endif  /* !HAVE_NLA_NUL_STRING */
 
 #endif /* compat.h */