datapath: Add support for kernel 3.14.

[sliver-openvswitch.git] / datapath / compat.h

diff --git a/datapath/compat.h b/datapath/compat.h
index 2873f0a..f38d38c 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -25,43 +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
-}
-
-#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)