[ovs-dev] [PATCH] datapath: Account for RHEL 6.6 backport of netdev_rx_handler_register().

Jesse Gross jesse at nicira.com
Tue Jul 7 16:22:34 UTC 2015


RHEL 6.6 has backported the version of netdev_rx_handler_register() that
allows OVS to register on old kernels. It's presumably the same as ours, so
it's simpler to just keep using the one that we have.

Reported-by: Chris <contact at progbau.de>
Signed-off-by: Jesse Gross <jesse at nicira.com>
---
 datapath/linux/compat/include/linux/netdevice.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
index d726390..3763200 100644
--- a/datapath/linux/compat/include/linux/netdevice.h
+++ b/datapath/linux/compat/include/linux/netdevice.h
@@ -25,6 +25,8 @@ extern void dev_disable_lro(struct net_device *dev);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
     defined HAVE_RHEL_OVS_HOOK
 
+#define netdev_rx_handler_register rpl_netdev_rx_handler_register
+
 #ifdef HAVE_RHEL_OVS_HOOK
 typedef struct sk_buff *(openvswitch_handle_frame_hook_t)(struct sk_buff *skb);
 extern openvswitch_handle_frame_hook_t *openvswitch_handle_frame_hook;
@@ -40,6 +42,7 @@ int netdev_rx_handler_register(struct net_device *dev,
 			       void *rx_handler_data);
 #endif
 
+#define netdev_rx_handler_unregister rpl_netdev_rx_handler_unregister
 void netdev_rx_handler_unregister(struct net_device *dev);
 #endif
 
-- 
2.1.4




More information about the dev mailing list