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

diff --git a/datapath/compat.h b/datapath/compat.h
index c786b9739..bc7e88055 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,14 +32,6 @@ static inline void skb_clear_rxhash(struct sk_buff *skb)
 #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,
 #else