From 2fb2cb980c4a0026cc64e693a92c349d4b4f4efe Mon Sep 17 00:00:00 2001
From: Jesse Gross <jesse@nicira.com>
Date: Wed, 21 Sep 2011 12:41:52 -0700
Subject: [PATCH] datapath: IFF_BRIDGE_PORT is backported by Centos 5.6.
Some versions of Centos 5.6 backport the flag IFF_BRIDGE_PORT
without the associated rx_handler changes, so this changes to
use a version check since we really don't care about the actual
symbol.
Reported-by: Srinivasan Ramasubramanian <vrsrini@gmail.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
datapath/vport-netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 4c7f1cb43..9c01079b0 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -374,7 +374,7 @@ error:
/* Returns null if this device is not attached to a datapath. */
struct vport *netdev_get_vport(struct net_device *dev)
{
-#ifdef IFF_BRIDGE_PORT
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
#if IFF_BRIDGE_PORT != IFF_OVS_DATAPATH
if (likely(dev->priv_flags & IFF_OVS_DATAPATH))
#else
--
2.47.0