diff options
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/linux/compat/include/linux/if.h | 6 | ||||
| -rw-r--r-- | datapath/vport-netdev.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/datapath/linux/compat/include/linux/if.h b/datapath/linux/compat/include/linux/if.h index 5ea620dc..a09f1128 100644 --- a/datapath/linux/compat/include/linux/if.h +++ b/datapath/linux/compat/include/linux/if.h @@ -14,10 +14,8 @@ #define IFF_TX_SKB_SHARING 0 #endif -#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,36) -#define IFF_OVS_DATAPATH IFF_BRIDGE_PORT -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) -#define IFF_OVS_DATAPATH 0 /* no-op flag */ +#ifndef IFF_OVS_DATAPATH +#define IFF_OVS_DATAPATH 0 #endif #endif diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c index 2db55929..07c7abdb 100644 --- a/datapath/vport-netdev.c +++ b/datapath/vport-netdev.c @@ -386,7 +386,7 @@ error: struct vport *ovs_netdev_get_vport(struct net_device *dev) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) -#if IFF_BRIDGE_PORT != IFF_OVS_DATAPATH +#if IFF_OVS_DATAPATH != 0 if (likely(dev->priv_flags & IFF_OVS_DATAPATH)) #else if (likely(rcu_access_pointer(dev->rx_handler) == netdev_frame_hook)) |