datapath: IFF_OVS_DATAPATH will exist in in 2.6.37

Signed-off-by: Simon Horman <horms@verge.net.au>
[Jesse: drop comment that no longer applies]
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if.h b/datapath/linux-2.6/compat-2.6/include/linux/if.h
index 2fd629c8ca6c88e7dd4432559d187f89797fd3f0..43128b763362c8f7d613c02ce909fc3681fc325d 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/if.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/if.h
@@ -10,10 +10,9 @@
 
 #endif /* linux kernel < 2.6.31 */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-/* XXX: Change to a unique value after merge */
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,36)
 #define IFF_OVS_DATAPATH IFF_BRIDGE_PORT
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 #define IFF_OVS_DATAPATH 0             /* no-op flag */
 #endif