diff options
author | Martin Borg <martin.borg@enea.com> | 2016-02-22 14:09:57 +0100 |
---|---|---|
committer | Nora Björklund <nora.bjorklund@enea.com> | 2016-02-29 13:50:52 +0100 |
commit | 7c0ab0937532741b31985ae908bcf6b0602bd8aa (patch) | |
tree | 788e6d48d95eaec978f8e86b964788e024cc5586 /recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch | |
parent | 3f36f9ea3dc013cc3306017becccca70d4f5a314 (diff) | |
download | meta-nfv-access-common-7c0ab0937532741b31985ae908bcf6b0602bd8aa.tar.gz |
linx: update to v.2.6.7
linx and linx-mod recipes updated to version 2.6.7.
The patches we applied have been included in this release.
Signed-off-by: Martin Borg <martin.borg@enea.com>
Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>
Diffstat (limited to 'recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch')
-rw-r--r-- | recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch b/recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch deleted file mode 100644 index 60c69a8..0000000 --- a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Fixed build errors for linx_mod with kernel 3.12.X. | ||
2 | |||
3 | For details, see [LXCR-3427]. | ||
4 | |||
5 | Upstream-Status: Not Applicable | ||
6 | |||
7 | Signed-off-by: Liviu Gheorghisan <liviu.gheorghisan@enea.com> | ||
8 | |||
9 | --- | ||
10 | --- a/af_linx.c 2014-04-02 10:19:44.000000000 +0300 | ||
11 | +++ b/af_linx.c 2014-07-23 17:40:01.629687646 +0300 | ||
12 | @@ -1034,8 +1034,11 @@ | ||
13 | failure: | ||
14 | *errcode = err; | ||
15 | return NULL; | ||
16 | -#else | ||
17 | +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) | ||
18 | return sock_alloc_send_pskb(sk, 0, data_len, 0, errcode); | ||
19 | +#else | ||
20 | + /* max_page_order == 0 => no paged allocations */ | ||
21 | + return sock_alloc_send_pskb(sk, 0, data_len, 0, errcode, 0); | ||
22 | #endif | ||
23 | } | ||
24 | |||