[meta-freescale] [meta-fsl-ppc][PATCH 06/30] asf: update to a8bbba6

ting.liu at nxp.com ting.liu at nxp.com
Fri Jun 17 03:02:43 PDT 2016


From: Zhenhua Luo <zhenhua.luo at nxp.com>

Changelog:
a8bbba6 Adding missing NULL checks for pointers
a57b54c ASF: Fix for compilation error in IPSEC
4c1e657 IPSEC: Fix for crash with RedSide disabled.
53c68a9 ASFQOS: Removing Compilation errors.
a2435dd ASF: Changing dpa files path and Flag
03d158e asf: Patch to fix api issue in kernel change.
30fe696 asf_ipsec: Patch to fix the insmod issue with gcc5.2
705730c asf: Patch to remove compilation error when ASF_IPV6 is disabled.
08c71f3 asfipsec: Patch to linearize nr_frag and fraglist coming from linux.

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 ...Patch-to-fix-the-insmod-issue-with-gcc5.2.patch | 69 ++++++++++++++++++++++
 recipes-kernel/asf/asf_git.bb                      |  4 +-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 recipes-kernel/asf/asf/0001-asf_ipsec-Patch-to-fix-the-insmod-issue-with-gcc5.2.patch

diff --git a/recipes-kernel/asf/asf/0001-asf_ipsec-Patch-to-fix-the-insmod-issue-with-gcc5.2.patch b/recipes-kernel/asf/asf/0001-asf_ipsec-Patch-to-fix-the-insmod-issue-with-gcc5.2.patch
new file mode 100644
index 0000000..bc7ff46
--- /dev/null
+++ b/recipes-kernel/asf/asf/0001-asf_ipsec-Patch-to-fix-the-insmod-issue-with-gcc5.2.patch
@@ -0,0 +1,69 @@
+From 30fe6960f9e8ca035641d87344aa1cf4aca54979 Mon Sep 17 00:00:00 2001
+From: Sandeep Malik <Sandeep.Malik at freescale.com>
+Date: Tue, 5 Jan 2016 17:57:29 +0530
+Subject: [PATCH] asf_ipsec: Patch to fix the insmod issue with gcc5.2
+
+When asf_ipsec module compiled with gcc5.2 is insmod;
+it fails to load with an error "Unknown Symbol". The
+issue is that the newer compiler does strict checking
+for inline functions.
+
+Signed-off-by: Sandeep Malik <Sandeep.Malik at nxp.com>
+
+QASF-1430
+---
+ asfmodule/asfipsec/driver/ipseccmn.h   | 5 +++++
+ asfmodule/asfipsec/driver/ipsecfp.c    | 5 -----
+ asfmodule/asfipsec/driver/ipsecfp_ah.c | 4 ----
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/asfmodule/asfipsec/driver/ipseccmn.h b/asfmodule/asfipsec/driver/ipseccmn.h
+index 1dd44fa..8731fba 100644
+--- a/asfmodule/asfipsec/driver/ipseccmn.h
++++ b/asfmodule/asfipsec/driver/ipseccmn.h
+@@ -44,6 +44,11 @@ extern unsigned int *pulVSGL2blobMagicNumber;
+ extern unsigned int **pulTunnelMagicNumber;
+ extern unsigned int ulTimeStamp_g;
+ 
++static inline ASF_void_t secfp_SkbFree(ASF_void_t *freeArg)
++{
++	ASFSkbFree(freeArg);
++}
++
+ #define ASFIPSEC_ERR	asf_err
+ #define ASFIPSEC_DPERR asf_dperr
+ 
+diff --git a/asfmodule/asfipsec/driver/ipsecfp.c b/asfmodule/asfipsec/driver/ipsecfp.c
+index b1c273e..ca1eceb 100644
+--- a/asfmodule/asfipsec/driver/ipsecfp.c
++++ b/asfmodule/asfipsec/driver/ipsecfp.c
+@@ -278,11 +278,6 @@ void secfp_IVDeInit(void)
+ #endif
+ 
+ 
+-inline ASF_void_t secfp_SkbFree(ASF_void_t *freeArg)
+-{
+-	ASFSkbFree(freeArg);
+-}
+-
+ void secfp_deInit(void)
+ {
+ 	ASFIPSEC_PRINT("DeInitializing Sec FP ");
+diff --git a/asfmodule/asfipsec/driver/ipsecfp_ah.c b/asfmodule/asfipsec/driver/ipsecfp_ah.c
+index c2aca1a..c4a681c 100644
+--- a/asfmodule/asfipsec/driver/ipsecfp_ah.c
++++ b/asfmodule/asfipsec/driver/ipsecfp_ah.c
+@@ -124,10 +124,6 @@ void secfp_prepareAHOutDescriptor(struct sk_buff *skb, void *pData,
+ #ifdef ASFIPSEC_DEBUG_FRAME
+ extern void print_desc(struct talitos_desc *desc);
+ #endif
+-static inline ASF_void_t secfp_SkbFree(ASF_void_t *freeArg)
+-{
+-	ASFSkbFree(freeArg);
+-}
+ 
+ extern __be16 secfp_IPv4_IDs[NR_CPUS];
+ static inline __be16 secfp_getNextId(void)
+-- 
+2.4.3
+
diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index b9d53e6..38a9863 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -3,8 +3,8 @@ SECTION = "asf"
 LICENSE = "GPLv2 & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v1.9.x"
-SRCREV = "9580a629d3aec3ab3c5e152c6693846b96787906"
+SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v2.0.x"
+SRCREV = "a8bbba6c2fd23bd79446c0ee62e352bfed528fb4"
 
 inherit module qoriq_build_64bit_kernel
 
-- 
1.9.2



More information about the meta-freescale mailing list