X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Flinux-2.6%2Fcompat-2.6%2Finclude%2Flinux%2Fif.h;h=43128b763362c8f7d613c02ce909fc3681fc325d;hb=ecf9ebff6c0a68d53d600f20ae978aaa96da765f;hp=2fd629c8ca6c88e7dd4432559d187f89797fd3f0;hpb=37f055c758e2d74ee4abc1ebca94aa62700f3ca0;p=openvswitch

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 2fd629c8..43128b76 100644
--- 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