X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fcompat.h;h=f38d38c06c8e6f5e7fa1f65b9ae96379d6ddc83a;hb=e2f3178f0582eda302bdc5629189b6a56d9fbcdd;hp=c786b97394fdea82f78f68d83a0a9855415172a8;hpb=3025a772a1ab6cc364a87b481b6e66b703d7bd46;p=sliver-openvswitch.git

diff --git a/datapath/compat.h b/datapath/compat.h
index c786b9739..f38d38c06 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -25,51 +25,10 @@
 #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)
-	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
-
-#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)