Hello community,
here is the log from the commit of package openvswitch for openSUSE:Factory
checked in at 2013-11-22 07:37:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openvswitch (Old)
and /work/SRC/openSUSE:Factory/.openvswitch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openvswitch"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes 2013-10-02
13:31:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes
2013-11-22 07:37:27.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 20 02:51:57 UTC 2013 - km...@suse.com
+
+- Incorporate ubuntu Linux 3.11 fix to prevent kernel datapath panics.
+ Addresses bnc#851395
+-------------------------------------------------------------------
New:
----
datapath-add-support-for-linux-3.11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openvswitch.spec ++++++
--- /var/tmp/diff_new_pack.0kklRs/_old 2013-11-22 07:37:27.000000000 +0100
+++ /var/tmp/diff_new_pack.0kklRs/_new 2013-11-22 07:37:27.000000000 +0100
@@ -46,6 +46,7 @@
Source99: README.packager
Patch0: sle11-device-ops-backport.diff
Patch1: vlan_apichange.patch
+Patch2: datapath-add-support-for-linux-3.11.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@@ -241,6 +242,7 @@
%setup -q
%patch0
%patch1 -p1
+%patch2
set -- *
mkdir source
++++++ datapath-add-support-for-linux-3.11.patch ++++++
Index: datapath/dp_notify.c
===================================================================
--- datapath/dp_notify.c.orig
+++ datapath/dp_notify.c
@@ -77,7 +77,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: datapath/linux/compat/include/linux/netdevice.h
===================================================================
--- datapath/linux/compat/include/linux/netdevice.h.orig
+++ datapath/linux/compat/include/linux/netdevice.h
@@ -154,6 +154,17 @@ static inline int rpl_netif_needs_gso(st
}
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
+
+/* Simply pass through the passed parameter for Linux < 3.11.0 */
+static inline struct net_device *
+netdev_notifier_info_to_dev(void *info)
+{
+ return info;
+}
+
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
typedef u32 netdev_features_t;
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
