git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Revert "datapath: rhel: Account for RHEL specific backports"
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
include
/
linux
/
netdevice.h
diff --git
a/datapath/linux/compat/include/linux/netdevice.h
b/datapath/linux/compat/include/linux/netdevice.h
index
f2ced69
..
ba1fc59
100644
(file)
--- a/
datapath/linux/compat/include/linux/netdevice.h
+++ b/
datapath/linux/compat/include/linux/netdevice.h
@@
-20,6
+20,11
@@
struct net;
#define to_net_dev(class) container_of(class, struct net_device, NETDEV_DEV_MEMBER)
#endif
#define to_net_dev(class) container_of(class, struct net_device, NETDEV_DEV_MEMBER)
#endif
+#ifdef HAVE_RHEL_OVS_HOOK
+extern struct sk_buff *(*openvswitch_handle_frame_hook)(struct sk_buff *skb);
+extern int nr_bridges;
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
static inline
struct net *dev_net(const struct net_device *dev)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
static inline
struct net *dev_net(const struct net_device *dev)
@@
-84,19
+89,33
@@
extern int skb_checksum_help(struct sk_buff *skb, int);
extern int skb_checksum_help(struct sk_buff *skb);
#endif
extern int skb_checksum_help(struct sk_buff *skb);
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
+ defined HAVE_RHEL_OVS_HOOK
static inline int netdev_rx_handler_register(struct net_device *dev,
void *rx_handler,
void *rx_handler_data)
{
static inline int netdev_rx_handler_register(struct net_device *dev,
void *rx_handler,
void *rx_handler_data)
{
+#ifdef HAVE_RHEL_OVS_HOOK
+ rcu_assign_pointer(dev->ax25_ptr, rx_handler_data);
+ nr_bridges++;
+ rcu_assign_pointer(openvswitch_handle_frame_hook, rx_handler_data);
+#else
if (dev->br_port)
return -EBUSY;
rcu_assign_pointer(dev->br_port, rx_handler_data);
if (dev->br_port)
return -EBUSY;
rcu_assign_pointer(dev->br_port, rx_handler_data);
+#endif
return 0;
}
static inline void netdev_rx_handler_unregister(struct net_device *dev)
{
return 0;
}
static inline void netdev_rx_handler_unregister(struct net_device *dev)
{
+#ifdef HAVE_RHEL_OVS_HOOK
+ rcu_assign_pointer(dev->ax25_ptr, NULL);
+
+ if (--nr_bridges <= 0)
+ rcu_assign_pointer(openvswitch_handle_frame_hook, NULL);
+#else
rcu_assign_pointer(dev->br_port, NULL);
rcu_assign_pointer(dev->br_port, NULL);
+#endif
}
#endif
}
#endif