]> git.proxmox.com Git - pve-kernel-2.6.32.git/blame - ovspatches/ovs-compile.patch
call /etc/kernel hooks
[pve-kernel-2.6.32.git] / ovspatches / ovs-compile.patch
CommitLineData
f3df0a51
DM
1Index: newovs/acinclude.m4
2===================================================================
3--- newovs.orig/acinclude.m4 2014-08-14 22:34:33.000000000 +0200
4+++ newovs/acinclude.m4 2014-09-18 06:50:07.000000000 +0200
5@@ -257,6 +257,7 @@
6 OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol])
7 OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t])
8 OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats])
9+ OVS_GREP_IFELSE([$KSRC/include/net/net_namespace.h], [pernet_operations])
10
11 OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
12
13Index: newovs/datapath/linux/compat/net_namespace.c
14===================================================================
15--- newovs.orig/datapath/linux/compat/net_namespace.c 2014-07-14 12:28:51.000000000 +0200
16+++ newovs/datapath/linux/compat/net_namespace.c 2014-09-18 06:52:24.000000000 +0200
17@@ -3,7 +3,7 @@
18 #include <net/net_namespace.h>
19 #include <net/netns/generic.h>
20
21-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
22+#ifndef HAVE_PERNET_OPERATIONS
23
24 int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet)
25 {
26Index: newovs/datapath/linux/compat/include/net/net_namespace.h
27===================================================================
28--- newovs.orig/datapath/linux/compat/include/net/net_namespace.h 2014-07-14 12:28:51.000000000 +0200
29+++ newovs/datapath/linux/compat/include/net/net_namespace.h 2014-09-18 06:55:31.000000000 +0200
30@@ -3,7 +3,7 @@
31
32 #include_next <net/net_namespace.h>
33
34-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
35+#ifndef HAVE_PERNET_OPERATIONS
36 /* for 2.6.32* */
37 struct rpl_pernet_operations {
38 int (*init)(struct net *net);