From 7c0ab0937532741b31985ae908bcf6b0602bd8aa Mon Sep 17 00:00:00 2001 From: Martin Borg Date: Mon, 22 Feb 2016 14:09:57 +0100 Subject: linx: update to v.2.6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Nora Björklund --- .../linx/linx-2.6.6/liblinx_free_buf.patch | 22 -- recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch | 29 --- recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch | 38 --- .../linx/linx-mod-2.6.6/linx-kernel-modules.patch | 288 --------------------- .../support-for-3.11-kernel-versions.patch | 206 --------------- .../linx-mod-2.6.6/support-for-3.12-kernels.patch | 24 -- .../linx-mod-2.6.6/support-for-3.15-kernels.patch | 60 ----- recipes-enea/linx/linx-mod_2.6.6.bb | 32 --- recipes-enea/linx/linx-mod_2.6.7.bb | 30 +++ recipes-enea/linx/linx.inc | 7 +- recipes-enea/linx/linx_2.6.6.bb | 6 - recipes-enea/linx/linx_2.6.7.bb | 6 + 12 files changed, 39 insertions(+), 709 deletions(-) delete mode 100644 recipes-enea/linx/linx-2.6.6/liblinx_free_buf.patch delete mode 100644 recipes-enea/linx/linx-2.6.6/liblinx_nobase.patch delete mode 100644 recipes-enea/linx/linx-2.6.6/linxcfg_nobase.patch delete mode 100644 recipes-enea/linx/linx-mod-2.6.6/linx-kernel-modules.patch delete mode 100644 recipes-enea/linx/linx-mod-2.6.6/support-for-3.11-kernel-versions.patch delete mode 100644 recipes-enea/linx/linx-mod-2.6.6/support-for-3.12-kernels.patch delete mode 100644 recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch delete mode 100644 recipes-enea/linx/linx-mod_2.6.6.bb create mode 100644 recipes-enea/linx/linx-mod_2.6.7.bb delete mode 100644 recipes-enea/linx/linx_2.6.6.bb create mode 100644 recipes-enea/linx/linx_2.6.7.bb 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 @@ -Fixed buffer free problem when sending between threads in the same process. - -Upstream-Status: Not Applicable - -Signed-off-by: Huimin She - ---- -diff -rup a/liblinx/linx.c b/liblinx/linx.c ---- a/liblinx/linx.c 2014-04-17 13:40:30.000000000 +0200 -+++ b/liblinx/linx.c 2014-07-24 14:22:30.264648751 +0200 -@@ -711,7 +711,10 @@ int linx_send(LINX * linx, union LINX_SI - if (ret == 0) { - sig_adm->sndrcv = sndrcv; - } -- adm_free_buf(linx, sig_adm); -+ if (ret != 1) { -+ /* Don't free signals sent back to itself, they are needed later! */ -+ adm_free_buf(linx, sig_adm); -+ } - out: - /* Take signal pointer from user. */ - *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 @@ -From 5ea9763286eb43e01c4ef2f3db59e13367a77138 Mon Sep 17 00:00:00 2001 -From: jack zhang -Date: Mon, 17 Dec 2012 03:52:11 +0100 -Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea - Linux -Signed-off-by: jack zhang - - Upstream-Status: Pending - For details, see LINXCR-1518 ---- - liblinx/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/liblinx/Makefile.am b/liblinx/Makefile.am -index 8559e43..3ce47d6 100644 ---- a/liblinx/Makefile.am -+++ b/liblinx/Makefile.am -@@ -47,7 +47,7 @@ dist_man7_MANS = $(LINXROOT)/doc/man7/linx.7 - - include $(LINXROOT)/flags.am - --include_HEADERS = \ -+nobase_include_HEADERS = \ - $(LINXROOT)/include/linx.h \ - $(LINXROOT)/include/linx_ioctl.h \ - $(LINXROOT)/include/linx_socket.h \ --- -1.7.5.4 - 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 @@ -From a3b3dc8117490ddfcc2081fca5ff663e4157a106 Mon Sep 17 00:00:00 2001 -From: jack zhang -Date: Mon, 17 Dec 2012 03:57:15 +0100 -Subject: [PATCH] LXCR-995 As an Enea sales person, I want LINX added to Enea - Linux -Signed-off-by: jack zhang - - Upstream-Status: Pending - For details, see LINXCR-1518 ---- - linxcfg/Makefile.am | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/linxcfg/Makefile.am b/linxcfg/Makefile.am -index 9fc8e84..287c71b 100644 ---- a/linxcfg/Makefile.am -+++ b/linxcfg/Makefile.am -@@ -24,16 +24,14 @@ dist_man1_MANS = \ - $(LINXROOT)/doc/man1/mkcmclcon.1 \ - $(LINXROOT)/doc/man1/rmcmclcon.1 - --include_HEADERS = \ -+nobase_include_HEADERS = \ - $(LINXROOT)/include/linxcfg.h \ - $(LINXROOT)/include/linux/ethcm_db_ioctl.h \ - $(LINXROOT)/include/linux/rlnh_db_ioctl.h \ - $(LINXROOT)/include/linux/tcpcm_db_ioctl.h \ - $(LINXROOT)/include/linux/shmcm_db_ioctl.h \ -- $(LINXROOT)/include/linux/riocm_db_ioctl.h \ - $(LINXROOT)/include/linux/cmcl_db_ioctl.h \ - $(LINXROOT)/include/linux/riocm_db_ioctl.h \ -- $(LINXROOT)/include/linux/cmcl_db_ioctl.h \ - $(LINXROOT)/include/db_ioctl.h \ - $(LINXROOT)/include/ethcm_db_ioctl.h \ - $(LINXROOT)/include/rlnh_db_ioctl.h \ --- -1.7.5.4 - diff --git a/recipes-enea/linx/linx-mod-2.6.6/linx-kernel-modules.patch b/recipes-enea/linx/linx-mod-2.6.6/linx-kernel-modules.patch deleted file mode 100644 index f29019b..0000000 --- a/recipes-enea/linx/linx-mod-2.6.6/linx-kernel-modules.patch +++ /dev/null @@ -1,288 +0,0 @@ -Use KERNEL_SRC and modules_install to get use of pokys build kernel modules. -fix version.h problem. - -Signed-off-by: Anders Roxell - -Upstream-status: Pending ---- -diff -uNr a/cmcl/Makefile b/cmcl/Makefile ---- a/cmcl/Makefile 2013-02-25 15:46:59.777325274 +0100 -+++ b/cmcl/Makefile 2013-02-25 15:57:22.038398316 +0100 -@@ -3,8 +3,8 @@ - LINX ?= $(CURDIR)/../../.. - include $(LINX)/net/linx/config.mk - --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - ifneq ($(VENDOR_VERSION), "") - EXTRA_CFLAGS += -DGFP_IS_INT -@@ -38,15 +38,17 @@ - - linx_cmcl-y += cmcl.o - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) linx_cmcl.ko .. - - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order ../linx_cmcl.ko - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod - -diff -uNr a/config.mk b/config.mk ---- a/config.mk 2013-02-25 15:46:59.781325113 +0100 -+++ b/config.mk 2013-02-25 16:13:30.672459997 +0100 -@@ -3,7 +3,7 @@ - # CROSS_COMPILE is cross compiler prefix (including full path) - CROSS_COMPILE ?= - # KERNEL is the path to your kernel sources --KERNEL ?= -+KERNEL_SRC ?= - - # Host architecture - HOST_ARCH ?= $(patsubst i%86,i386,$(shell uname -m)) -@@ -26,13 +26,13 @@ - endif - - ifeq ($(ARCH),$(HOST_ARCH)) --ifndef KERNEL --KERNEL := $(HOST_KERNEL) -+ifndef KERNEL_SRC -+KERNEL_SRC := $(HOST_KERNEL) - endif - else --ifndef KERNEL -+ifndef KERNEL_SRC - ifdef NEED_KERNEL --$(error Please define KERNEL.) -+$(error Please define KERNEL_SRC.) - endif - endif - endif -@@ -53,8 +53,8 @@ - ifdef CROSS_COMPILE - $(ECHO) "# CROSS_COMPILE=$(CROSS_COMPILE)" - endif --ifdef KERNEL -- $(ECHO) "# KERNEL=$(KERNEL)" -+ifdef KERNEL_SRC -+ $(ECHO) "# KERNEL_SRC=$(KERNEL_SRC)" - endif - ifdef VERBOSE - $(ECHO) "# VERBOSE=$(VERBOSE)" -@@ -62,7 +62,7 @@ - $(ECHO) "# VERBOSE=no" - endif - --export ARCH CROSS_COMPILE KERNEL LINX -+export ARCH CROSS_COMPILE KERNEL_SRC LINX - - .PHONY: echo_config - -@@ -117,5 +117,5 @@ - # in the mercury linux distribution. - EXTRA_CFLAGS += -I$(KDIR)/arch/ppc -DRLNH_ALIGN_ANY - else # x86 --KDIR := /lib/modules/$(shell uname -r)/build -+KDIR := /lib/modules/$(KERNEL_VERSION)/build - endif -diff -uNr a/ecm/Makefile b/ecm/Makefile ---- a/ecm/Makefile 2013-02-25 15:46:59.781325113 +0100 -+++ b/ecm/Makefile 2013-02-25 16:11:13.754388313 +0100 -@@ -5,8 +5,8 @@ - LINX ?= $(CURDIR)/../../.. - include $(LINX)/net/linx/config.mk - --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - ifneq ($(VENDOR_VERSION), "") - EXTRA_CFLAGS += -DGFP_IS_INT -@@ -43,14 +43,16 @@ - linx_eth_cm-y += ecm_rx.o - linx_eth_cm-y += ecm_kutils.o - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) linx_eth_cm.ko .. - - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order ../linx_eth_cm.ko - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod -diff -uNr a/Makefile b/Makefile ---- a/Makefile 2013-02-25 15:46:59.781325113 +0100 -+++ b/Makefile 2013-02-25 15:53:22.752757899 +0100 -@@ -63,9 +63,9 @@ - 2_6_11 := 132619 - - # Vendors version of kernel, needed to catch certain back patches --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - # Main line kernel version --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - # - # 'gt_or_eq' -@@ -140,14 +140,16 @@ - obj-y += riocm/ - obj-y += cmcl/ - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) */*.ko . - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod - -diff -uNr a/riocm/Makefile b/riocm/Makefile ---- a/riocm/Makefile 2013-02-25 15:46:59.781325113 +0100 -+++ b/riocm/Makefile 2013-02-25 16:05:33.381125565 +0100 -@@ -5,8 +5,8 @@ - LINX ?= $(CURDIR)/../../.. - include $(LINX)/net/linx/config.mk - --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - ifneq ($(VENDOR_VERSION), "") - EXTRA_CFLAGS += -DGFP_IS_INT -@@ -43,15 +43,17 @@ - linx_rio_cm-y += rio_rx.o - linx_rio_cm-y += rio_kutils.o - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) linx_rio_cm.ko .. - - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order ../linx_rio_cm.ko - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod - -diff -uNr a/shmcm/Makefile b/shmcm/Makefile ---- a/shmcm/Makefile 2013-02-25 15:46:59.781325113 +0100 -+++ b/shmcm/Makefile 2013-02-25 16:03:58.113250295 +0100 -@@ -5,8 +5,8 @@ - LINX ?= $(CURDIR)/../../.. - include $(LINX)/net/linx/config.mk - --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - ifneq ($(VENDOR_VERSION), "") - EXTRA_CFLAGS += -DGFP_IS_INT -@@ -60,7 +60,7 @@ - -I$(LINX)/net/linx/include \ - -I$(LINX)/net/linx/shmcm - --INSTALLDIR = /lib/modules/`uname -r`/kernel/net/linx -+INSTALLDIR = /lib/modules/$(KERNEL_VERSION)/kernel/net/linx - MODULES = linx_shm_cm.ko - - obj-m := linx_shm_cm.o -@@ -70,15 +70,17 @@ - linx_shm_cm-y += shmcm_tx.o - linx_shm_cm-y += shmcm_kutils.o - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) linx_shm_cm.ko .. - - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order ../linx_shm_cm.ko - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod - -diff -uNr a/tcp_cm/Makefile b/tcp_cm/Makefile ---- a/tcp_cm/Makefile 2013-02-25 15:46:59.781325113 +0100 -+++ b/tcp_cm/Makefile 2013-02-25 16:10:09.097187839 +0100 -@@ -3,8 +3,8 @@ - LINX ?= $(CURDIR)/../../.. - include $(LINX)/net/linx/config.mk - --KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL)/include/linux/version.h) --VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL)/include/linux/version.h) -+KERNEL_CODE := $(shell awk '/LINUX_VERSION_CODE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) -+VENDOR_VERSION := $(shell awk '/UTS_RELEASE/ {print $$3}' $(KERNEL_SRC)/include/generated/utsrelease.h) - - ifneq ($(VENDOR_VERSION), "") - EXTRA_CFLAGS += -DGFP_IS_INT -@@ -38,15 +38,17 @@ - - linx_tcp_cm-y += tcp_cm.o - -+SRC := $(shell pwd) -+ - modules: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules - $(CP) linx_tcp_cm.ko .. - - clean: -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` clean -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) clean - $(LINXRM) Module.symvers Module.markers modules.order ../linx_tcp_cm.ko - --install: modules -- $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL) M=`pwd` modules_install -+modules_install: modules -+ $(XMAKE) ARCH=$(ARCH) V=$(V) -C $(KERNEL_SRC) M=$(SRC) modules_install - depmod - diff --git a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.11-kernel-versions.patch b/recipes-enea/linx/linx-mod-2.6.6/support-for-3.11-kernel-versions.patch deleted file mode 100644 index d6f9106..0000000 --- a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.11-kernel-versions.patch +++ /dev/null @@ -1,206 +0,0 @@ -From 20294330f08283d28b6092b568156e29b1792328 Mon Sep 17 00:00:00 2001 -From: Adrian Dudau -Date: Thu, 12 Dec 2013 11:23:24 +0100 -Subject: [PATCH] support for 3.11 kernel versions - -Fixed NULL pointer dereference in ecm_conn.c - -Signed-off-by: Adrian Dudau ---- - cfg/db_proc.c | 23 ++++++++++++++++++----- - ecm/ecm_conn.c | 11 ++++++++--- - ipc/hunt.c | 24 ++++++++++++++++++++++++ - 3 files changed, 50 insertions(+), 8 deletions(-) - -diff --git a/cfg/db_proc.c b/cfg/db_proc.c -index c062a3d..bad0353 100644 ---- a/cfg/db_proc.c -+++ b/cfg/db_proc.c -@@ -41,6 +41,12 @@ - #include "db_format.h" - #include - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) -+#define PDE_INODE_NAME(inode) PDE_DATA(inode) -+#else -+#define PDE_INODE_NAME(inode) PDE(inode)->name -+#endif -+ - struct db_seq { - const struct db_template *template; - struct list_head *list; -@@ -148,11 +154,11 @@ static int db_proc_open(struct inode *inode, struct file *file) - if (status != 0) - goto out_20; - -- status = db_template_get(PDE(inode)->name, &p->template); -+ status = db_template_get(PDE_INODE_NAME(inode), &p->template); - if (status != 0) - goto out_20; - -- status = db_list_get(PDE(inode)->name, &p->list); -+ status = db_list_get(PDE_INODE_NAME(inode), &p->list); - if (status != 0) - goto out_10; - -@@ -161,7 +167,7 @@ static int db_proc_open(struct inode *inode, struct file *file) - return 0; - - out_10: -- db_template_put(PDE(inode)->name, &p->template); -+ db_template_put(PDE_INODE_NAME(inode), &p->template); - out_20: - kfree(p); - return status; -@@ -217,11 +223,11 @@ static int db_proc_release(struct inode *inode, struct file *file) - s = file->private_data; - p = s->private; - -- status = db_list_put(PDE(inode)->name, &p->list); -+ status = db_list_put(PDE_INODE_NAME(inode), &p->list); - if (status != 0) - return status; - -- status = db_template_put(PDE(inode)->name, &p->template); -+ status = db_template_put(PDE_INODE_NAME(inode), &p->template); - if (status != 0) - return status; - -@@ -258,14 +264,21 @@ int db_proc_add(const char *name) - { - struct proc_dir_entry *pde; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ pde = proc_create_data(name, 0777, db_proc_root, -+ &db_proc_file_ops, (void *)name); -+#else - pde = create_proc_entry(name, 0777, db_proc_root); -+#endif - if (pde == NULL) - return -EINVAL; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - pde->owner = THIS_MODULE; - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - pde->proc_fops = &db_proc_file_ops; -+#endif - return 0; - } - EXPORT_SYMBOL(db_proc_add); -diff --git a/ecm/ecm_conn.c b/ecm/ecm_conn.c -index aaf5161..b81abd1 100644 ---- a/ecm/ecm_conn.c -+++ b/ecm/ecm_conn.c -@@ -905,8 +905,9 @@ static void free_ecm_connection(struct RlnhLinkObj *co) - { - /* Undo alloc_ecm_connection(). */ - if (co != NULL) { -- if (list_empty(&co->ecm_dev->conn_list)) -- dev_remove_pack(&co->ecm_dev->pt); -+ if (co->ecm_dev != NULL) -+ if (list_empty(&co->ecm_dev->conn_list)) -+ dev_remove_pack(&co->ecm_dev->pt); - if (co->con_name != NULL) - kfree(co->con_name); - if (co->dev_name != NULL) -@@ -1315,7 +1316,11 @@ static int net_event(struct notifier_block *nb, unsigned long event, void *data) - struct ecm_work_net_event *p; - - (void)nb; -- dev = data; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) -+ dev = netdev_notifier_info_to_dev(data); -+#else -+ dev = data; -+#endif - - w = alloc_ecm_work(sizeof(*p), ECM_WORK_NET_EVENT, GFP_KERNEL); - if (w == NULL) -diff --git a/ipc/hunt.c b/ipc/hunt.c -index 843a893..f4564eb 100644 ---- a/ipc/hunt.c -+++ b/ipc/hunt.c -@@ -743,7 +743,9 @@ static inline struct sock *__locate_name(const char *name, - unsigned hash, uint32_t hunter_spid) - { - struct sock *s, *s_found = NULL; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)) - struct hlist_node *node; -+#endif - - linx_trace_enter(LINX_TRACEGROUP_IPC, - "%s, %d, 0x%x, 0x%x", name, len, hash, hunter_spid); -@@ -753,7 +755,11 @@ static inline struct sock *__locate_name(const char *name, - - /* Traverse the list of sockets in the specified hash slot to find a - match. */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -+ sk_for_each(s, &linx_sockets_bound[hash]) { -+#else - sk_for_each(s, node, &linx_sockets_bound[hash]) { -+#endif - linx_check_sock(s); - - /* If the length of the aname are the same, potential match was found. */ -@@ -1122,7 +1128,9 @@ int linx_info_sockets(struct linx_info_sockets *isockets, - LINX_SPID __user * spids) - { - struct sock *sk; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)) - const struct hlist_node *node; -+#endif - int i, tot_sockets = 0, tot_sockets_tmp = 0, max_sockets; - - LINX_ASSERT(isockets != NULL); -@@ -1131,7 +1139,11 @@ int linx_info_sockets(struct linx_info_sockets *isockets, - - read_lock_bh(&linx_socket_bound_unbound_lock); - /* Count the number of sockets the needs to be returned. */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -+ sk_for_each(sk, &linx_sockets_unbound) { -+#else - sk_for_each(sk, node, &linx_sockets_unbound) { -+#endif - if (linx_sk(sk)->type == LINX_TYPE_REMOTE && isockets->remote) { - tot_sockets_tmp++; - } else if (linx_sk(sk)->type == LINX_TYPE_LOCAL && -@@ -1156,7 +1168,11 @@ int linx_info_sockets(struct linx_info_sockets *isockets, - - tot_sockets_tmp = 0; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -+ sk_for_each(sk, &linx_sockets_unbound) { -+#else - sk_for_each(sk, node, &linx_sockets_unbound) { -+#endif - LINX_SPID spid = linx_sock_to_spid(sk); - if (linx_sk(sk)->type == LINX_TYPE_REMOTE && - isockets->remote) { -@@ -1197,7 +1213,11 @@ int linx_info_sockets(struct linx_info_sockets *isockets, - for (i = 0; i < LINX_HASH_SIZE; i++) { - tot_sockets_tmp = 0; - read_lock_bh(&linx_socket_bound_unbound_lock); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -+ sk_for_each(sk, &linx_sockets_bound[i]) { -+#else - sk_for_each(sk, node, &linx_sockets_bound[i]) { -+#endif - if (linx_sk(sk)->type == LINX_TYPE_REMOTE && - isockets->remote) { - tot_sockets_tmp++; -@@ -1222,7 +1242,11 @@ int linx_info_sockets(struct linx_info_sockets *isockets, - } - - tot_sockets_tmp = 0; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -+ sk_for_each(sk, &linx_sockets_bound[i]) { -+#else - sk_for_each(sk, node, &linx_sockets_bound[i]) { -+#endif - LINX_SPID spid = linx_sock_to_spid(sk); - if (linx_sk(sk)->type == LINX_TYPE_REMOTE && - isockets->remote) { --- -1.8.3.2 - 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 @@ -Fixed build errors for linx_mod with kernel 3.12.X. - -For details, see [LXCR-3427]. - -Upstream-Status: Not Applicable - -Signed-off-by: Liviu Gheorghisan - ---- ---- a/af_linx.c 2014-04-02 10:19:44.000000000 +0300 -+++ b/af_linx.c 2014-07-23 17:40:01.629687646 +0300 -@@ -1034,8 +1034,11 @@ - failure: - *errcode = err; - return NULL; --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) - return sock_alloc_send_pskb(sk, 0, data_len, 0, errcode); -+#else -+ /* max_page_order == 0 => no paged allocations */ -+ return sock_alloc_send_pskb(sk, 0, data_len, 0, errcode, 0); - #endif - } - diff --git a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch b/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch deleted file mode 100644 index 80118a4..0000000 --- a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch +++ /dev/null @@ -1,60 +0,0 @@ -Fixed build errors for linx-mod with kernel >= 3.15.0 - -Upstream-Status: Not Applicable - -Signed-off-by: Huimin She - ---- -diff -rup a/af_linx.c b/af_linx.c ---- a/af_linx.c 2014-07-25 16:22:23.295570583 +0200 -+++ b/af_linx.c 2014-07-25 16:22:23.299570583 +0200 -@@ -743,7 +743,11 @@ setup_receive_filter(struct sock *sk, st - /* This function is called to wake up a receiving socket when it is sleeping - * waiting for a new message in poll or select. - */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) - static void linx_data_ready(struct sock *sk, int len) -+#else -+static void linx_data_ready(struct sock *sk) -+#endif - { - linx_check_sock(sk); - -@@ -1401,7 +1405,11 @@ linx_do_legacy_sendmsg(struct sock *sk, - LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); - #endif - /* Wake up the receiver, if it sleeps and wait for the signal. */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) - to->sk_data_ready(to, payload_size); -+#else -+ to->sk_data_ready(to); -+#endif - - return 0; - out: -@@ -1577,7 +1585,11 @@ linx_do_sendmsg(struct sock *sk, - LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); - #endif - /* Wake up the receiver, if it sleeps and wait for the signal. */ -- to->sk_data_ready(to, payload_size); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) -+ to->sk_data_ready(to, payload_size); -+#else -+ to->sk_data_ready(to); -+#endif - - return 0; - out: -@@ -1636,7 +1648,11 @@ int __linx_do_sendmsg_skb_to_local_sk(st - LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); - #endif - /* Wake up the receiver, if it sleeps and waits for the signal. */ -- to->sk_data_ready(to, payload_size); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) -+ to->sk_data_ready(to, payload_size); -+#else -+ to->sk_data_ready(to); -+#endif - - return 0; - } diff --git a/recipes-enea/linx/linx-mod_2.6.6.bb b/recipes-enea/linx/linx-mod_2.6.6.bb deleted file mode 100644 index 837fc3a..0000000 --- a/recipes-enea/linx/linx-mod_2.6.6.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "LINX for Linux fast IPC" -DESCRIPTION = "LINX is a distributed communication protocol stack for transparent inter node and interprocess communication for a heterogeneous mix of systems." -HOMEPAGE = "http://linx.sourceforge.net/" - -SECTION = "kernel/modules" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://../../COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "linux-libc-headers linx" -RRECOMMENDS_${PN} = "linx kmod" - -SRC_URI = "http://linux.enea.com/linx/linx-${PV}.tar.gz \ - file://support-for-3.12-kernels.patch \ - file://support-for-3.15-kernels.patch" - -SRC_URI[md5sum] = "f6d7e103eee0807cacf73aa20cf95571" -SRC_URI[sha256sum] = "a8fa3fe221e883ecb6afaa001652c96080a474b95e8d37c3bcf3e0c2ae618799" - -S = "${WORKDIR}/linx-${PV}/net/linx" - -inherit module - -module_do_compile_prepend () { - - if [ -z $(cat ${STAGING_KERNEL_BUILDDIR}/.config | grep "CONFIG_MODULES=y") ] ; then - echo "The specified Linux kernel has no support for pluggable modules (CONFIG_MODULES=y). Enable it before baking this." - exit 1 - fi - - do_make_scripts -} diff --git a/recipes-enea/linx/linx-mod_2.6.7.bb b/recipes-enea/linx/linx-mod_2.6.7.bb new file mode 100644 index 0000000..9bcf459 --- /dev/null +++ b/recipes-enea/linx/linx-mod_2.6.7.bb @@ -0,0 +1,30 @@ +SUMMARY = "LINX for Linux fast IPC" +DESCRIPTION = "LINX is a distributed communication protocol stack for transparent inter node and interprocess communication for a heterogeneous mix of systems." +HOMEPAGE = "http://linx.sourceforge.net/" + +SECTION = "kernel/modules" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://../../COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "linux-libc-headers linx" +RRECOMMENDS_${PN} = "linx kmod" + +SRC_URI = "http://linux.enea.com/linx/linx-${PV}.tar.gz" + +SRC_URI[md5sum] = "f9d7634faa2d7338e51418e2dca82875" +SRC_URI[sha256sum] = "d047eb8d4b63ae385bf89dc3cc09854a0fe27f3f51c19dc332da7d40f9c0c28c" + +S = "${WORKDIR}/linx-${PV}/net/linx" + +inherit module + +module_do_compile_prepend () { + + if [ -z $(cat ${STAGING_KERNEL_BUILDDIR}/.config | grep "CONFIG_MODULES=y") ] ; then + echo "The specified Linux kernel has no support for pluggable modules (CONFIG_MODULES=y). Enable it before baking this." + exit 1 + fi + + do_make_scripts +} diff --git a/recipes-enea/linx/linx.inc b/recipes-enea/linx/linx.inc index 3160cfb..3388964 100644 --- a/recipes-enea/linx/linx.inc +++ b/recipes-enea/linx/linx.inc @@ -6,11 +6,10 @@ SECTION = "system/library" DEPENDS = "linux-libc-headers virtual/libc" RRECOMMENDS_${PN} = "linx-mod" -SRC_URI = "http://linux.enea.com/linx/linx-${PV}.tar.gz \ - file://liblinx_free_buf.patch" +SRC_URI = "http://linux.enea.com/linx/linx-${PV}.tar.gz" -SRC_URI[md5sum] = "f6d7e103eee0807cacf73aa20cf95571" -SRC_URI[sha256sum] = "a8fa3fe221e883ecb6afaa001652c96080a474b95e8d37c3bcf3e0c2ae618799" +SRC_URI[md5sum] = "f9d7634faa2d7338e51418e2dca82875" +SRC_URI[sha256sum] = "d047eb8d4b63ae385bf89dc3cc09854a0fe27f3f51c19dc332da7d40f9c0c28c" S = "${WORKDIR}/linx-${PV}" diff --git a/recipes-enea/linx/linx_2.6.6.bb b/recipes-enea/linx/linx_2.6.6.bb deleted file mode 100644 index 79f7ed7..0000000 --- a/recipes-enea/linx/linx_2.6.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require linx.inc -LICENSE = "BSD" - -PR = "r0" - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" diff --git a/recipes-enea/linx/linx_2.6.7.bb b/recipes-enea/linx/linx_2.6.7.bb new file mode 100644 index 0000000..79f7ed7 --- /dev/null +++ b/recipes-enea/linx/linx_2.6.7.bb @@ -0,0 +1,6 @@ +require linx.inc +LICENSE = "BSD" + +PR = "r0" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -- cgit v1.2.3-54-g00ecf