adopt OVS patches for new kernel (fix compile errors)

diff --git a/ovspatches/ovs-compile.patch b/ovspatches/ovs-compile.patch
index e0e37988092be9bbbe211029b64e570cd60e5962..095a3098a1aadf03d3a08502d64cc6ee2ef284fa 100644 (file)
--- a/ovspatches/ovs-compile.patch
+++ b/ovspatches/ovs-compile.patch
@@ -1,7 +1,7 @@
-Index: new/acinclude.m4
+Index: newovs/acinclude.m4
 ===================================================================
---- new.orig/acinclude.m4      2015-06-18 21:32:47.000000000 +0200
-+++ new/acinclude.m4   2015-09-15 12:14:56.000000000 +0200
+--- 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])
@@ -19,10 +19,10 @@ Index: new/acinclude.m4
  
    OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
                    [OVS_DEFINE([HAVE_BOOL_TYPE])])
-Index: new/datapath/linux/compat/net_namespace.c
+Index: newovs/datapath/linux/compat/net_namespace.c
 ===================================================================
---- new.orig/datapath/linux/compat/net_namespace.c     2015-06-18 21:32:47.000000000 +0200
-+++ new/datapath/linux/compat/net_namespace.c  2015-09-15 12:14:56.000000000 +0200
+--- 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>
@@ -32,10 +32,10 @@ Index: new/datapath/linux/compat/net_namespace.c
  
  int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet)
  {
-Index: new/datapath/linux/compat/include/net/net_namespace.h
+Index: newovs/datapath/linux/compat/include/net/net_namespace.h
 ===================================================================
---- new.orig/datapath/linux/compat/include/net/net_namespace.h 2015-06-18 21:32:47.000000000 +0200
-+++ new/datapath/linux/compat/include/net/net_namespace.h      2015-09-15 12:14:56.000000000 +0200
+--- 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>
@@ -45,10 +45,10 @@ Index: new/datapath/linux/compat/include/net/net_namespace.h
  /* for 2.6.32* */
  struct rpl_pernet_operations {
        int (*init)(struct net *net);
-Index: new/datapath/linux/compat/dev-openvswitch.c
+Index: newovs/datapath/linux/compat/dev-openvswitch.c
 ===================================================================
---- new.orig/datapath/linux/compat/dev-openvswitch.c   2015-06-18 21:32:47.000000000 +0200
-+++ new/datapath/linux/compat/dev-openvswitch.c        2015-09-15 12:14:56.000000000 +0200
+--- 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 */
@@ -59,10 +59,10 @@ Index: new/datapath/linux/compat/dev-openvswitch.c
  
  static int nr_bridges;
  
-Index: new/datapath/linux/compat/include/linux/netdevice.h
+Index: newovs/datapath/linux/compat/include/linux/netdevice.h
 ===================================================================
---- new.orig/datapath/linux/compat/include/linux/netdevice.h   2015-06-18 21:32:47.000000000 +0200
-+++ new/datapath/linux/compat/include/linux/netdevice.h        2015-09-15 12:14:56.000000000 +0200
+--- 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
@@ -74,10 +74,10 @@ Index: new/datapath/linux/compat/include/linux/netdevice.h
  #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: new/datapath/vport-netdev.c
+Index: newovs/datapath/vport-netdev.c
 ===================================================================
---- new.orig/datapath/vport-netdev.c   2015-06-18 21:32:47.000000000 +0200
-+++ new/datapath/vport-netdev.c        2015-09-15 13:39:03.000000000 +0200
+--- 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);
@@ -116,3 +116,29 @@ Index: new/datapath/vport-netdev.c
  /*
   * 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;