mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

datapath: Simplify vport-netdev-hook compatibility code.

Browse Source 
Move compat code to netdev_rx_handler_register() definition.
It also adds type safety for netdev-hook.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
Pravin B Shelar
2013-10-29 14:10:26 -07:00
parent 0386824614
commit 95986f397d
4 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
datapath/linux/compat/dev-openvswitch.c
View File

@@ -1,6 +1,8 @@
#ifndef HAVE_DEV_DISABLE_LRO
#include <linux/if_bridge.h>
#include <linux/netdevice.h>
#include <linux/version.h>
#ifndef HAVE_DEV_DISABLE_LRO
#ifdef NETIF_F_LRO
#include <linux/ethtool.h>
@@ -30,3 +32,60 @@ void dev_disable_lro(struct net_device *dev) { }
#endif /* NETIF_F_LRO */
#endif /* HAVE_DEV_DISABLE_LRO */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
defined HAVE_RHEL_OVS_HOOK
static int nr_bridges;
#ifdef HAVE_RHEL_OVS_HOOK
int netdev_rx_handler_register(struct net_device *dev,
openvswitch_handle_frame_hook_t *hook,
void *rx_handler_data)
{
nr_bridges++;
rcu_assign_pointer(dev->ax25_ptr, rx_handler_data);
if (nr_bridges == 1)
rcu_assign_pointer(openvswitch_handle_frame_hook, hook);
return 0;
}
#else
int netdev_rx_handler_register(struct net_device *dev,
struct sk_buff *(*hook)(struct net_bridge_port *p,
struct sk_buff *skb),
void *rx_handler_data)
{
nr_bridges++;
if (dev->br_port)
return -EBUSY;
rcu_assign_pointer(dev->br_port, rx_handler_data);
if (nr_bridges == 1)
br_handle_frame_hook = hook;
return 0;
}
#endif
void netdev_rx_handler_unregister(struct net_device *dev)
{
nr_bridges--;
#ifdef HAVE_RHEL_OVS_HOOK
rcu_assign_pointer(dev->ax25_ptr, NULL);
if (nr_bridges)
return;
rcu_assign_pointer(openvswitch_handle_frame_hook, NULL);
#else
rcu_assign_pointer(dev->br_port, NULL);
if (nr_bridges)
return;
br_handle_frame_hook = NULL;
#endif
}
#endif