summaryrefslogtreecommitdiffstats
path: root/recipes-enea/linx/linx-2.6.6
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-enea/linx/linx-2.6.6')
-rw-r--r--recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch22
-rw-r--r--recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch29
-rw-r--r--recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch38
3 files changed, 0 insertions, 89 deletions
diff --git a/recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch b/recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch
deleted file mode 100644
index 42f3e99..0000000
--- a/recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Fixed buffer free problem when sending between threads in the same process.
2
3Upstream-Status: Not Applicable
4
5Signed-off-by: Huimin She <huimin.she@enea.com>
6
7---
8diff -rup a/liblinx/linx.c b/liblinx/linx.c
9--- a/liblinx/linx.c 2014-04-17 13:40:30.000000000 +0200
10+++ b/liblinx/linx.c 2014-07-24 14:22:30.264648751 +0200
11@@ -711,7 +711,10 @@ int linx_send(LINX * linx, union LINX_SI
12 if (ret == 0) {
13 sig_adm->sndrcv = sndrcv;
14 }
15- adm_free_buf(linx, sig_adm);
16+ if (ret != 1) {
17+ /* Don't free signals sent back to itself, they are needed later! */
18+ adm_free_buf(linx, sig_adm);
19+ }
20 out:
21 /* Take signal pointer from user. */
22 *sig = LINX_NIL;
diff --git a/recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch b/recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch
deleted file mode 100644
index 05a4b7e..0000000
--- a/recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 5ea9763286eb43e01c4ef2f3db59e13367a77138 Mon Sep 17 00:00:00 2001
2From: jack zhang <jack.zhang@enea.com>
3Date: Mon, 17 Dec 2012 03:52:11 +0100
4Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea
5 Linux
6Signed-off-by: jack zhang <jack.zhang@enea.com>
7
8 Upstream-Status: Pending
9 For details, see LINXCR-1518
10---
11 liblinx/Makefile.am | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/liblinx/Makefile.am b/liblinx/Makefile.am
15index 8559e43..3ce47d6 100644
16--- a/liblinx/Makefile.am
17+++ b/liblinx/Makefile.am
18@@ -47,7 +47,7 @@ dist_man7_MANS = $(LINXROOT)/doc/man7/linx.7
19
20 include $(LINXROOT)/flags.am
21
22-include_HEADERS = \
23+nobase_include_HEADERS = \
24 $(LINXROOT)/include/linx.h \
25 $(LINXROOT)/include/linx_ioctl.h \
26 $(LINXROOT)/include/linx_socket.h \
27--
281.7.5.4
29
diff --git a/recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch b/recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch
deleted file mode 100644
index af4b477..0000000
--- a/recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From a3b3dc8117490ddfcc2081fca5ff663e4157a106 Mon Sep 17 00:00:00 2001
2From: jack zhang <jack.zhang@enea.com>
3Date: Mon, 17 Dec 2012 03:57:15 +0100
4Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea
5 Linux
6Signed-off-by: jack zhang <jack.zhang@enea.com>
7
8 Upstream-Status: Pending
9 For details, see LINXCR-1518
10---
11 linxcfg/Makefile.am | 4 +---
12 1 files changed, 1 insertions(+), 3 deletions(-)
13
14diff --git a/linxcfg/Makefile.am b/linxcfg/Makefile.am
15index 9fc8e84..287c71b 100644
16--- a/linxcfg/Makefile.am
17+++ b/linxcfg/Makefile.am
18@@ -24,16 +24,14 @@ dist_man1_MANS = \
19 $(LINXROOT)/doc/man1/mkcmclcon.1 \
20 $(LINXROOT)/doc/man1/rmcmclcon.1
21
22-include_HEADERS = \
23+nobase_include_HEADERS = \
24 $(LINXROOT)/include/linxcfg.h \
25 $(LINXROOT)/include/linux/ethcm_db_ioctl.h \
26 $(LINXROOT)/include/linux/rlnh_db_ioctl.h \
27 $(LINXROOT)/include/linux/tcpcm_db_ioctl.h \
28 $(LINXROOT)/include/linux/shmcm_db_ioctl.h \
29- $(LINXROOT)/include/linux/riocm_db_ioctl.h \
30 $(LINXROOT)/include/linux/cmcl_db_ioctl.h \
31 $(LINXROOT)/include/linux/riocm_db_ioctl.h \
32- $(LINXROOT)/include/linux/cmcl_db_ioctl.h \
33 $(LINXROOT)/include/db_ioctl.h \
34 $(LINXROOT)/include/ethcm_db_ioctl.h \
35 $(LINXROOT)/include/rlnh_db_ioctl.h \
36--
371.7.5.4
38