From: Simon Horman Date: Tue, 2 Nov 2010 12:35:13 +0000 (+0900) Subject: datapath: IFF_OVS_DATAPATH will exist in in 2.6.37 X-Git-Tag: v1.1.0~946 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ded8fe209ff51df31ce6e7b74787584edfe00724;p=sliver-openvswitch.git datapath: IFF_OVS_DATAPATH will exist in in 2.6.37 Signed-off-by: Simon Horman [Jesse: drop comment that no longer applies] Signed-off-by: Jesse Gross --- 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 2fd629c8c..43128b763 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