From c8f78ecb9b8a39a955631ca1a415d94da588bc26 Mon Sep 17 00:00:00 2001 From: "dengke.du@windriver.com" Date: Wed, 19 Oct 2016 13:27:00 +0800 Subject: linux-atm: fix do_compile error With linux kernel v4.8, for file ./src/maint/zntune.c, glibc time.h is included before linux time.h, when compile zntune.c, it break down by the following errors: redefinition of 'struct timespec' 'struct timeval' 'struct timezone' 'struct itimerval' We should exclude the linux time.h by disable linux/atm_zatm.h and move some useful definition in linux/atm_zatm.h to a new header file in linux-atm source code to resolve it. Signed-off-by: Dengke Du Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- ...-fix-compile-error-with-linux-kernel-v4.8.patch | 74 ++++++++++++++++++++++ .../recipes-support/linux-atm/linux-atm_2.5.2.bb | 4 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch new file mode 100644 index 0000000000..583a6ca60b --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch @@ -0,0 +1,74 @@ +From 7cdafc0dee8054f82777ed3bf6d4c8b5582d09ad Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 18 Oct 2016 07:56:02 +0000 +Subject: [PATCH] fix compile error with linux kernel v4.8 + +In src/maint/zntune.c, the glibc time.h is included before linux +time.h, so when compile the zntune.c, it break down by errors: + + redefinition of 'struct timespec' 'struct timeval' + 'struct timezone' 'struct itimerval' + +We should exclude the linux time.h by disable linux/atm_zatm.h and +move some useful definition in linux/atm_zatm.h to zntune.c to resolve +it. + +Upstream-status: Pending + +Signed-off-by: Dengke Du +--- + src/include/atm_zatm.h | 26 ++++++++++++++++++++++++++ + src/maint/zntune.c | 3 +-- + 2 files changed, 27 insertions(+), 2 deletions(-) + create mode 100644 src/include/atm_zatm.h + +diff --git a/src/include/atm_zatm.h b/src/include/atm_zatm.h +new file mode 100644 +index 0000000..7d64f4d +--- /dev/null ++++ b/src/include/atm_zatm.h +@@ -0,0 +1,26 @@ ++#include ++#include ++ ++#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) ++ /* get pool statistics */ ++#define ZATM_GETPOOLZ _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc) ++ /* get statistics and zero */ ++#define ZATM_SETPOOL _IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc) ++ ++struct zatm_pool_info { ++ int ref_count; /* free buffer pool usage counters */ ++ int low_water,high_water; /* refill parameters */ ++ int rqa_count,rqu_count; /* queue condition counters */ ++ int offset,next_off; /* alignment optimizations: offset */ ++ int next_cnt,next_thres; /* repetition counter and threshold */ ++}; /* set pool parameters */ ++ ++struct zatm_pool_req { ++ int pool_num; /* pool number */ ++ struct zatm_pool_info info; /* actual information */ ++}; ++ ++#define ZATM_OAM_POOL 0 /* free buffer pool for OAM cells */ ++#define ZATM_AAL0_POOL 1 /* free buffer pool for AAL0 cells */ ++#define ZATM_AAL5_POOL_BASE 2 /* first AAL5 free buffer pool */ ++#define ZATM_LAST_POOL ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */ +diff --git a/src/maint/zntune.c b/src/maint/zntune.c +index 62d62ab..bb93eab 100644 +--- a/src/maint/zntune.c ++++ b/src/maint/zntune.c +@@ -13,9 +13,8 @@ + #include + #include + #include ++#include + #include /* for struct timeval, although it's not used */ +-#include +- + + static void usage(const char *name) + { +-- +2.9.0 + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index edfb045a96..6ab8b07d02 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -9,7 +9,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://link-with-ldflags.patch \ - file://install-from-buildir.patch" + file://install-from-buildir.patch \ + file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ +" SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" -- cgit 1.2.3-korg