adopt OVS patches for new kernel (fix compile errors)

[pve-kernel-2.6.32.git] / ovspatches / ovs-compile.patch

Index: newovs/acinclude.m4
===================================================================
--- newovs.orig/acinclude.m4	2015-06-18 21:32:47.000000000 +0200
+++ newovs/acinclude.m4	2015-10-27 12:02:53.000000000 +0100
@@ -291,6 +291,7 @@
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol])
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t])
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats])
+  OVS_GREP_IFELSE([$KSRC/include/net/net_namespace.h], [pernet_operations])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
 
@@ -333,7 +334,7 @@
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_clear_hash])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [int.skb_zerocopy(],
                   [OVS_DEFINE([HAVE_SKB_ZEROCOPY])])
-  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash])
+  #OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
                   [OVS_DEFINE([HAVE_BOOL_TYPE])])
Index: newovs/datapath/linux/compat/net_namespace.c
===================================================================
--- newovs.orig/datapath/linux/compat/net_namespace.c	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/linux/compat/net_namespace.c	2015-10-27 12:02:53.000000000 +0100
@@ -3,7 +3,7 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#ifndef HAVE_PERNET_OPERATIONS
 
 int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet)
 {
Index: newovs/datapath/linux/compat/include/net/net_namespace.h
===================================================================
--- newovs.orig/datapath/linux/compat/include/net/net_namespace.h	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/linux/compat/include/net/net_namespace.h	2015-10-27 12:02:53.000000000 +0100
@@ -3,7 +3,7 @@
 
 #include_next <net/net_namespace.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#ifndef HAVE_PERNET_OPERATIONS
 /* for 2.6.32* */
 struct rpl_pernet_operations {
 	int (*init)(struct net *net);
Index: newovs/datapath/linux/compat/dev-openvswitch.c
===================================================================
--- newovs.orig/datapath/linux/compat/dev-openvswitch.c	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/linux/compat/dev-openvswitch.c	2015-10-27 12:02:53.000000000 +0100
@@ -33,8 +33,7 @@
 
 #endif /* HAVE_DEV_DISABLE_LRO */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
-    defined HAVE_RHEL_OVS_HOOK
+#if 0
 
 static int nr_bridges;
 
Index: newovs/datapath/linux/compat/include/linux/netdevice.h
===================================================================
--- newovs.orig/datapath/linux/compat/include/linux/netdevice.h	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/linux/compat/include/linux/netdevice.h	2015-10-27 12:02:53.000000000 +0100
@@ -22,9 +22,7 @@
 extern void dev_disable_lro(struct net_device *dev);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
-    defined HAVE_RHEL_OVS_HOOK
-
+#if 0
 #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;
Index: newovs/datapath/vport-netdev.c
===================================================================
--- newovs.orig/datapath/vport-netdev.c	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/vport-netdev.c	2015-10-27 12:02:53.000000000 +0100
@@ -36,7 +36,7 @@
 
 static void netdev_port_receive(struct vport *vport, struct sk_buff *skb);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+#if 1
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)
 {
@@ -253,8 +253,7 @@
 /* Returns null if this device is not attached to a datapath. */
 struct vport *ovs_netdev_get_vport(struct net_device *dev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) || \
-    defined HAVE_RHEL_OVS_HOOK
+#if 1
 #if IFF_OVS_DATAPATH != 0
 	if (likely(dev->priv_flags & IFF_OVS_DATAPATH))
 #else
@@ -263,7 +262,7 @@
 #ifdef HAVE_RHEL_OVS_HOOK
 		return (struct vport *)rcu_dereference_rtnl(dev->ax25_ptr);
 #else
-		return (struct vport *)rcu_dereference_rtnl(dev->rx_handler_data);
+        return (struct vport *)rcu_dereference_rtnl(netdev_extended(dev)->rx_handler_data);
 #endif
 	else
 		return NULL;
@@ -280,8 +279,7 @@
 	.send		= netdev_send,
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) && \
-    !defined HAVE_RHEL_OVS_HOOK
+#if 0
 /*
  * Enforces, mutual exclusion with the Linux bridge module, by declaring and
  * exporting br_should_route_hook.  Because the bridge module also exports the
Index: newovs/datapath/linux/compat/include/linux/in.h
===================================================================
--- newovs.orig/datapath/linux/compat/include/linux/in.h	2015-04-05 01:58:22.000000000 +0200
+++ newovs/datapath/linux/compat/include/linux/in.h	2015-10-27 12:04:12.000000000 +0100
@@ -4,7 +4,7 @@
 #include_next <linux/in.h>
 
 #include <linux/module.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#if 0
 static inline int proto_ports_offset(int proto)
 {
 	switch (proto) {
Index: newovs/datapath/linux/compat/include/net/ip.h
===================================================================
--- newovs.orig/datapath/linux/compat/include/net/ip.h	2015-06-18 21:32:47.000000000 +0200
+++ newovs/datapath/linux/compat/include/net/ip.h	2015-10-27 12:04:53.000000000 +0100
@@ -5,7 +5,7 @@
 
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#if 0
 static inline bool ip_is_fragment(const struct iphdr *iph)
 {
 	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;