X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fcompat.h;h=c7fd2252676e7fdb8944d7494d74a9700345859c;hb=5ca1ba484bd9ade5116a49cf241cb98219d7d696;hp=84a222f991b9267ef973fa89f18f7a139dc7ec57;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=sliver-openvswitch.git

diff --git a/datapath/compat.h b/datapath/compat.h
index 84a222f99..c7fd22526 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -1,25 +1,97 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #ifndef COMPAT_H
 #define COMPAT_H 1
 
-#include <linux/version.h>
+#include <linux/netlink.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;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+	len = nla_len(attr);
+	if (len >= maxlen)
+		return -EINVAL;
 
-#include "compat26.h"
+	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 */
+
+static inline void skb_clear_rxhash(struct sk_buff *skb)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+	skb->rxhash = 0;
+#endif
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+#define GENL_SOCK(net) (genl_sock)
+#define SET_NETNSOK
+#else
+#define GENL_SOCK(net) ((net)->genl_sock)
+#define SET_NETNSOK    .netnsok = true,
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#ifdef CONFIG_NETFILTER
+static inline u32 skb_get_mark(struct sk_buff *skb)
+{
+	return skb->nfmark;
+}
 
-#include "compat24.h"
+static inline void skb_set_mark(struct sk_buff *skb, u32 mark)
+{
+	skb->nfmark = mark;
+}
+#else /* CONFIG_NETFILTER */
+static inline u32 skb_get_mark(struct sk_buff *skb)
+{
+	return 0;
+}
 
+static inline void skb_set_mark(struct sk_buff *skb, u32 mark)
+{
+}
 #endif
+#else /* before 2.6.20 */
+static inline u32 skb_get_mark(struct sk_buff *skb)
+{
+	return skb->mark;
+}
 
+static inline void skb_set_mark(struct sk_buff *skb, u32 mark)
+{
+	skb->mark = mark;
+}
+#endif /* after 2.6.20 */
 
 #endif /* compat.h */