X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fcompat.h;h=f8f04697c58e6c73e8f61a1be2c876e6a2b3d83e;hb=e45d584eea92b71348501ce648f654837b14bb0f;hp=2873f0a8ccd7ff060df9a01bca0f7cc8f037a8f9;hpb=b3dcb73cc58a7ee089cfaec623818142196e1172;p=sliver-openvswitch.git

diff --git a/datapath/compat.h b/datapath/compat.h
index 2873f0a8c..f8f04697c 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -25,32 +25,6 @@
 #include <net/route.h>
 #include <net/xfrm.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;
-
-	len = nla_len(attr);
-	if (len >= maxlen)
-		return -EINVAL;
-
-	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)
@@ -58,10 +32,10 @@ static inline void skb_clear_rxhash(struct sk_buff *skb)
 #endif
 }
 
-#ifdef HAVE_PARALLEL_OPS
-#define SET_PARALLEL_OPS	.parallel_ops = true,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+#define GROUP_ID(grp)	0
 #else
-#define SET_PARALLEL_OPS
+#define GROUP_ID(grp)	((grp)->id)
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)