File 0001-datapath-Add-support-for-Linux-3.11.patch of Package openvswitch

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-datapath-Add-support-for-Linux-3.11.patch of Package openvswitch

From 54af97ad7ba7e103b91c48b9498edeef2fde1960 Mon Sep 17 00:00:00 2001
From: Pravin B Shelar <pshelar@nicira.com>
Date: Mon, 14 Oct 2013 15:26:40 -0700
Subject: [PATCH] datapath: Add support for Linux 3.11

Kernel 3.11 has support for extended GRE API required for
OVS datapath,  But vxlan still needs out of tree tunneling
compatibility.  Therefore to simplify, all tunneling modules
are forced to use compat tunneling.

CC: James Page <james.page@ubuntu.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---
 FAQ                                             | 1 +
 NEWS                                            | 1 +
 acinclude.m4                                    | 4 ++--
 datapath/dp_notify.c                            | 2 +-
 datapath/linux/compat/include/linux/netdevice.h | 7 +++++++
 datapath/linux/compat/include/net/gre.h         | 6 ++++++
 6 files changed, 18 insertions(+), 3 deletions(-)

Index: openvswitch-2.0.0/FAQ
===================================================================
--- openvswitch-2.0.0.orig/FAQ
+++ openvswitch-2.0.0/FAQ
@@ -149,6 +149,7 @@ A: The following table lists the Linux k
        1.10.x     2.6.18 to 3.8
        1.11.x     2.6.18 to 3.8
        2.0.x      2.6.32 to 3.10
+       2.1.x      2.6.32 to 3.11
 
    Open vSwitch userspace should also work with the Linux kernel module
    built into Linux 3.3 and later.
Index: openvswitch-2.0.0/acinclude.m4
===================================================================
--- openvswitch-2.0.0.orig/acinclude.m4
+++ openvswitch-2.0.0/acinclude.m4
@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     AC_MSG_RESULT([$kversion])
 
     if test "$version" -ge 3; then
-       if test "$version" = 3 && test "$patchlevel" -le 10; then
+       if test "$version" = 3 && test "$patchlevel" -le 13; then
           : # Linux 3.x
        else
-         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported])
+         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.13.x is not supported])
        fi
     else
        if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
Index: openvswitch-2.0.0/datapath/dp_notify.c
===================================================================
--- openvswitch-2.0.0.orig/datapath/dp_notify.c
+++ openvswitch-2.0.0/datapath/dp_notify.c
@@ -79,7 +79,7 @@ static int dp_device_event(struct notifi
 			   void *ptr)
 {
 	struct ovs_net *ovs_net;
-	struct net_device *dev = ptr;
+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 	struct vport *vport = NULL;
 
 	if (!ovs_is_internal_dev(dev))
Index: openvswitch-2.0.0/datapath/linux/compat/include/linux/netdevice.h
===================================================================
--- openvswitch-2.0.0.orig/datapath/linux/compat/include/linux/netdevice.h
+++ openvswitch-2.0.0/datapath/linux/compat/include/linux/netdevice.h
@@ -120,4 +120,11 @@ static inline void netdev_upper_dev_unli
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
+static inline struct net_device *netdev_notifier_info_to_dev(void *info)
+{
+	return info;
+}
+#endif
+
 #endif
Index: openvswitch-2.0.0/datapath/linux/compat/include/net/gre.h
===================================================================
--- openvswitch-2.0.0.orig/datapath/linux/compat/include/net/gre.h
+++ openvswitch-2.0.0/datapath/linux/compat/include/net/gre.h
@@ -74,12 +74,17 @@ static inline __be16 tnl_flags_to_gre_fl
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */
 
 #define MAX_GRE_PROTO_PRIORITY 255
+#define gre_cisco_protocol rpl_gre_cisco_protocol
+
 struct gre_cisco_protocol {
 	int (*handler)(struct sk_buff *skb, const struct tnl_ptk_info *tpi);
 	u8 priority;
 };
 
+#define gre_cisco_register rpl_gre_cisco_register
 int gre_cisco_register(struct gre_cisco_protocol *proto);
+
+#define gre_cisco_unregister rpl_gre_cisco_unregister
 int gre_cisco_unregister(struct gre_cisco_protocol *proto);
 
 #define gre_build_header rpl_gre_build_header
@@ -89,6 +94,7 @@ void gre_build_header(struct sk_buff *sk
 #define gre_handle_offloads rpl_gre_handle_offloads
 struct sk_buff *gre_handle_offloads(struct sk_buff *skb, bool gre_csum);
 
+#define ip_gre_calc_hlen rpl_ip_gre_calc_hlen
 static inline int ip_gre_calc_hlen(__be16 o_flags)
 {
 	int addend = 4;

Places

File 0001-datapath-Add-support-for-Linux-3.11.patch of Package openvswitch

Places