Merge branch 'master' into next

[sliver-openvswitch.git] / datapath / linux-2.6 / compat-2.6 / include / linux / in.h

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/in.h b/datapath/linux-2.6/compat-2.6/include/linux/in.h
index 2cfe645..fd5c3c6 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/in.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/in.h
@@ -3,14 +3,13 @@
 
 #include_next <linux/in.h>
 
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#ifndef HAVE_IPV4_IS_MULTICAST
 
 static inline bool ipv4_is_multicast(__be32 addr)
 {
        return (addr & htonl(0xf0000000)) == htonl(0xe0000000);
 }
 
-#endif /* linux kernel < 2.6.25 */
+#endif /* !HAVE_IPV4_IS_MULTICAST */
 
 #endif