diff options
Diffstat (limited to 'recipes-enea/linx/linx-2.6.6')
-rw-r--r-- | recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch | 22 | ||||
-rw-r--r-- | recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch | 29 | ||||
-rw-r--r-- | recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch | 38 |
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 @@ | |||
1 | Fixed buffer free problem when sending between threads in the same process. | ||
2 | |||
3 | Upstream-Status: Not Applicable | ||
4 | |||
5 | Signed-off-by: Huimin She <huimin.she@enea.com> | ||
6 | |||
7 | --- | ||
8 | diff -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 @@ | |||
1 | From 5ea9763286eb43e01c4ef2f3db59e13367a77138 Mon Sep 17 00:00:00 2001 | ||
2 | From: jack zhang <jack.zhang@enea.com> | ||
3 | Date: Mon, 17 Dec 2012 03:52:11 +0100 | ||
4 | Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea | ||
5 | Linux | ||
6 | Signed-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 | |||
14 | diff --git a/liblinx/Makefile.am b/liblinx/Makefile.am | ||
15 | index 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 | -- | ||
28 | 1.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 @@ | |||
1 | From a3b3dc8117490ddfcc2081fca5ff663e4157a106 Mon Sep 17 00:00:00 2001 | ||
2 | From: jack zhang <jack.zhang@enea.com> | ||
3 | Date: Mon, 17 Dec 2012 03:57:15 +0100 | ||
4 | Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea | ||
5 | Linux | ||
6 | Signed-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 | |||
14 | diff --git a/linxcfg/Makefile.am b/linxcfg/Makefile.am | ||
15 | index 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 | -- | ||
37 | 1.7.5.4 | ||
38 | |||