← Back to branch summary

~ubuntu-branches/ubuntu/raring/openvswitch/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0006-Bump-up-the-supported-kernel-versions-to-include-3.5.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-10-23 17:24:17 UTC
  • Revision ID: package-import@ubuntu.com-20121023172417-26590u7zfr4r795j
Tags: 1.4.3-0ubuntu2
https://launchpad.net/bugs/1068365
* Re-enable the openvswitch-datapath-dkms package to enable support
  for gre tunnels between virtual switches which is not supported
  in the kernel provided openvswitch module (LP: #1068365). 
  - d/patches/0001->0008*.patch: Cherry picked patches from upstream
    trunk which enable support for the 3.5 linux kernel and align
    dkms module naming with kernel module naming.
  - d/dkms.conf.in: Drop _mod postfix from dkms module names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-Bump-up-the-supported-kernel-versions-to-include-3.5.patch
 
1
From 4dbf00dfdb9b6ef2870b736192458c85d086230c Mon Sep 17 00:00:00 2001
 
2
From: Kyle Mestery <kmestery@cisco.com>
 
3
Date: Tue, 7 Aug 2012 18:48:21 -0400
 
4
Subject: [PATCH 6/8] Bump up the supported kernel versions to include 3.5.x.
 
5
 
 
6
Signed-off-by: Kyle Mestery <kmestery@cisco.com>
 
7
Signed-off-by: Jesse Gross <jesse@nicira.com>
 
8
 
 
9
Conflicts:
 
10
        datapath/datapath.c
 
11
---
 
12
 datapath/datapath.c |    4 ++--
 
13
 1 file changed, 2 insertions(+), 2 deletions(-)
 
14
 
 
15
diff --git a/datapath/datapath.c b/datapath/datapath.c
 
16
index 38bb10a..9864ce6 100644
 
17
--- a/datapath/datapath.c
 
18
+++ b/datapath/datapath.c
 
19
@@ -59,8 +59,8 @@
 
20
 #include "vport-internal_dev.h"
 
21
 
 
22
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) || \
 
23
-    LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
 
24
-#error Kernels before 2.6.18 or after 3.3 are not supported by this version of Open vSwitch.
 
25
+    LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
 
26
+#error Kernels before 2.6.18 or after 3.5 are not supported by this version of Open vSwitch.
 
27
 #endif
 
28
 
 
29
 int (*ovs_dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
30
-- 
 
31
1.7.10.4
 
32