Merge branch 'mainstream'

[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 f8240df..2ceff22 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
 
+#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)
@@ -77,23 +82,40 @@ extern void unregister_netdevice_many(struct list_head *head);
 extern void dev_disable_lro(struct net_device *dev);
 #endif
 
+#define skb_checksum_help rpl_skb_checksum_help
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-#define skb_checksum_help(skb) skb_checksum_help((skb), 0)
+extern int skb_checksum_help(struct sk_buff *skb, int);
+#else
+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)
 {
+#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);
+#else
        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)
 {
+#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);
+#endif
 }
 #endif
 
@@ -167,4 +189,23 @@ static inline struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
+
+/* XEN dom0 networking assumes dev->master is bond device
+ * and it tries to access bond private structure from dev->master
+ * ptr on receive path. This causes panic. Therefore it is better
+ * not to backport this API.
+ **/
+static inline int netdev_master_upper_dev_link(struct net_device *dev,
+                                              struct net_device *upper_dev)
+{
+       return 0;
+}
+
+static inline void netdev_upper_dev_unlink(struct net_device *dev,
+                                          struct net_device *upper_dev)
+{
+}
+#endif
+
 #endif