Signed-off-by: Simon Horman <horms@verge.net.au>
[Jesse: drop comment that no longer applies]
Signed-off-by: Jesse Gross <jesse@nicira.com>
#endif /* linux kernel < 2.6.31 */
#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
#define IFF_OVS_DATAPATH IFF_BRIDGE_PORT
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
#define IFF_OVS_DATAPATH 0 /* no-op flag */
#endif
#define IFF_OVS_DATAPATH 0 /* no-op flag */
#endif