[gentoo-commits] gentoo-x86 commit in net-misc/openvswitch/files: configure.patch kernel-3.11-support.patch atomic-test.patch kernel-3.12-support.patch xcp-interface-reconfigure.patch

[Matt Thode (prometheanfire)]

prometheanfire    14/02/09 08:56:18

  Added:                configure.patch kernel-3.11-support.patch
                        atomic-test.patch kernel-3.12-support.patch
                        xcp-interface-reconfigure.patch
  Log:
  fixing bugs 494152 498728 499500
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

Revision  Changes    Path
1.1                  net-misc/openvswitch/files/configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/configure.patch?rev=1.1&content-type=text/plain

Index: configure.patch
===================================================================
--- configure.orig	2014-01-27 21:55:14.116272645 +0200
+++ configure	2014-01-27 21:55:40.687273108 +0200
@@ -7949,10 +7949,10 @@
 $as_echo "$kversion" >&6; }
 
     if test "$version" -ge 3; then
-       if test "$version" = 3 && test "$patchlevel" -le 10; then
+       if test "$version" = 3 && test "$patchlevel" -le 12; then
           : # Linux 3.x
        else
-         as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported" "$LINENO" 5
+         as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported" "$LINENO" 5
        fi
     else
        if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then



1.1                  net-misc/openvswitch/files/kernel-3.11-support.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/kernel-3.11-support.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/kernel-3.11-support.patch?rev=1.1&content-type=text/plain

Index: kernel-3.11-support.patch
===================================================================
--- a/acinclude.m4
+++ b/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 11; 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.11.x is not supported])
        fi
     else
        if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
--- a/datapath/dp_notify.c
+++ b/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))
--- a/datapath/linux/compat/include/linux/netdevice.h
+++ b/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
--- a/datapath/linux/compat/include/net/gre.h
+++ b/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;



1.1                  net-misc/openvswitch/files/atomic-test.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/atomic-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/atomic-test.patch?rev=1.1&content-type=text/plain

Index: atomic-test.patch
===================================================================
Description: Link atomic test with -latomic for powerpc.
Author: Adam Conrad <adconrad@××××××.com>

--- openvswitch-2.0.0.orig/tests/automake.mk
+++ openvswitch-2.0.0/tests/automake.mk
@@ -181,7 +181,7 @@ tests_test_aes128_LDADD = lib/libopenvsw
 
 noinst_PROGRAMS += tests/test-atomic
 tests_test_atomic_SOURCES = tests/test-atomic.c
-tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS) -latomic
 
 noinst_PROGRAMS += tests/test-bundle
 tests_test_bundle_SOURCES = tests/test-bundle.c



1.1                  net-misc/openvswitch/files/kernel-3.12-support.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/kernel-3.12-support.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/kernel-3.12-support.patch?rev=1.1&content-type=text/plain

Index: kernel-3.12-support.patch
===================================================================
Description: Enable support for 3.12 kernel
Author: James Page <james.page@××××××.com>
Forwarded: no

--- a/acinclude.m4
+++ b/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 11; then
+       if test "$version" = 3 && test "$patchlevel" -le 12; then
           : # Linux 3.x
        else
-         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported])
+         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported])
        fi
     else
        if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then



1.1                  net-misc/openvswitch/files/xcp-interface-reconfigure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/xcp-interface-reconfigure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/xcp-interface-reconfigure.patch?rev=1.1&content-type=text/plain

Index: xcp-interface-reconfigure.patch
===================================================================
Description: Use xcp-xapi interface-reconfigure if found
 Ubuntu/Debian provide the XCP interface-reconfigure hook in
 a FHS compliant location; use this if found.
Author: James Page <james.page@××××××.com>
Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1195053
Forwarded: no

--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -43,6 +43,10 @@ def delete_cacert():
 def update(session, args):
     # Refresh bridge network UUIDs in case this host joined or left a pool.
     script = "/opt/xensource/libexec/interface-reconfigure"
+    # NOTE(jamespage): Override with distro xcp xapi locations
+    # if present
+    if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
+        script = '/usr/lib/xcp/lib/interface-reconfigure'
     try:
         retval = subprocess.call([script, "rewrite"])
         if retval != 0: