diff options
Diffstat (limited to 'meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-kni-net-fix-build-with-kernel-4.1.patch')
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-kni-net-fix-build-with-kernel-4.1.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-kni-net-fix-build-with-kernel-4.1.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-kni-net-fix-build-with-kernel-4.1.patch new file mode 100644 index 00000000..2a4dd638 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-kni-net-fix-build-with-kernel-4.1.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From abb59c037a74d822e402f9d9a3d6c4d06ce7c748 Mon Sep 17 00:00:00 2001 | ||
2 | From: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com> | ||
3 | Date: Fri, 26 Jun 2015 17:14:36 -0500 | ||
4 | Subject: [PATCH] kni: fix build with kernel 4.1 | ||
5 | |||
6 | Upstream-Status: Backport [2.1.1] | ||
7 | |||
8 | rebuild member was removed from headers_ops in kernel release | ||
9 | 4.1. Therefore kni module compilation breaks. | ||
10 | |||
11 | This patch add the properly checks to fix it. | ||
12 | |||
13 | Linux: d476059e77d1 ("net: Kill dev_rebuild_header") | ||
14 | |||
15 | Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com> | ||
16 | Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com> | ||
17 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
18 | --- | ||
19 | lib/librte_eal/linuxapp/kni/kni_net.c | 4 ++++ | ||
20 | 1 file changed, 4 insertions(+) | ||
21 | |||
22 | diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c | ||
23 | index dd95db5..c515870 100644 | ||
24 | --- a/lib/librte_eal/linuxapp/kni/kni_net.c | ||
25 | +++ b/lib/librte_eal/linuxapp/kni/kni_net.c | ||
26 | @@ -604,6 +604,7 @@ kni_net_header(struct sk_buff *skb, struct net_device *dev, | ||
27 | /* | ||
28 | * Re-fill the eth header | ||
29 | */ | ||
30 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) | ||
31 | static int | ||
32 | kni_net_rebuild_header(struct sk_buff *skb) | ||
33 | { | ||
34 | @@ -615,6 +616,7 @@ kni_net_rebuild_header(struct sk_buff *skb) | ||
35 | |||
36 | return 0; | ||
37 | } | ||
38 | +#endif /* < 4.1.0 */ | ||
39 | |||
40 | /** | ||
41 | * kni_net_set_mac - Change the Ethernet Address of the KNI NIC | ||
42 | @@ -634,7 +636,9 @@ static int kni_net_set_mac(struct net_device *netdev, void *p) | ||
43 | |||
44 | static const struct header_ops kni_net_header_ops = { | ||
45 | .create = kni_net_header, | ||
46 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) | ||
47 | .rebuild = kni_net_rebuild_header, | ||
48 | +#endif /* < 4.1.0 */ | ||
49 | .cache = NULL, /* disable caching */ | ||
50 | }; | ||
51 | |||
52 | -- | ||
53 | 1.7.9.5 | ||
54 | |||