| Message ID | 1451520648-5668-4-git-send-email-martin.blumenstingl@googlemail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi On 31/12/2015 01:10, Martin Blumenstingl wrote: > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif please just drop the old code. there is no need to be compatible to old kernels. John
Am 31.12.2015 um 08:12 schrieb John Crispin: > Hi > > On 31/12/2015 01:10, Martin Blumenstingl wrote: >> + >> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) >> +#include <linux/scatterlist.h> >> +#else >> #include <asm/scatterlist.h> >> +#endif > > please just drop the old code. there is no need to be compatible to old > kernels. > > John > I guess we should keep the compatibility with Kernel 4.1 as long as this kernel version is the default for this target and/or available for this target.
On 31/12/2015 10:51, Mathias Kresin wrote: > Am 31.12.2015 um 08:12 schrieb John Crispin: >> Hi >> >> On 31/12/2015 01:10, Martin Blumenstingl wrote: >>> + >>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) >>> +#include <linux/scatterlist.h> >>> +#else >>> #include <asm/scatterlist.h> >>> +#endif >> >> please just drop the old code. there is no need to be compatible to old >> kernels. >> >> John >> > > I guess we should keep the compatibility with Kernel 4.1 as long as this > kernel version is the default for this target and/or available for this > target. i was planning to jump straight to 4.4 John > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
On 12/31/2015 01:10 AM, Martin Blumenstingl wrote: > Upstream linux 4.2 commit 84be456f883c4685680fba8e5154b5f72e92957e > "remove <asm/scatterlist.h>" moves scatterlist.h to linux/ instead of asm/. > > Upstream linux 4.3 commit b0d955ba4688fcba8112884931aea1f1e6f50f03 > "crypto: aead - Remove old AEAD interfaces" removed aead_request_set_assoc. > aead_request_set_ad should be used instead. > --- > package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h | 6 ++++++ > package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h | 6 ++++++ > package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h | 7 +++++++ > package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h | 6 ++++++ > package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c | 7 +++++++ > package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c | 7 +++++++ > package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c | 10 ++++++++++ > 7 files changed, 49 insertions(+) > > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h > index 1d84da3..f030d62 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h > @@ -54,7 +54,13 @@ > #include <crypto/algapi.h> > #include <linux/module.h> > #include <linux/mm.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <linux/skbuff.h> > #include <linux/netdevice.h> > #include "ifxmips_deu.h" > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h > index 62ad96d..32e055c 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h > @@ -53,7 +53,13 @@ > #include <crypto/algapi.h> > #include <linux/module.h> > #include <linux/mm.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <linux/skbuff.h> > #include <linux/netdevice.h> > #include "ifxmips_deu.h" > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h > index 5198a4a..c376266 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h > @@ -31,11 +31,18 @@ > #ifndef IFXMIPS_DEU_DMA_H > #define IFXMIPS_DEU_DMA_H > > +#include <linux/version.h> > #include <linux/init.h> > #include <linux/module.h> > #include <linux/mm.h> > #include <linux/crypto.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <asm/byteorder.h> > #include <linux/skbuff.h> > #include <linux/netdevice.h> > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h > index d2cfd11..f801c24 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h > @@ -54,7 +54,13 @@ > #include <crypto/algapi.h> > #include <linux/module.h> > #include <linux/mm.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <linux/skbuff.h> > #include <linux/netdevice.h> > #include "ifxmips_deu.h" > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c > index a5f5f90..e546a92 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c > @@ -40,6 +40,7 @@ > > > /* Project header */ > +#include <linux/version.h> > #include <linux/init.h> > #include <linux/module.h> > #include <linux/mm.h> > @@ -48,7 +49,13 @@ > #include <crypto/sha.h> > #include <crypto/internal/hash.h> > #include <linux/types.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <asm/byteorder.h> > > #if defined(CONFIG_DANUBE) > diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c > index a5a6c39..be16152 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c > +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c > @@ -40,6 +40,7 @@ > > > /* Project header */ > +#include <linux/version.h> > #include <linux/init.h> > #include <linux/module.h> > #include <linux/mm.h> > @@ -47,7 +48,13 @@ > #include <linux/cryptohash.h> > #include <crypto/internal/hash.h> > #include <linux/types.h> > + > +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) > +#include <linux/scatterlist.h> > +#else > #include <asm/scatterlist.h> > +#endif > + > #include <asm/byteorder.h> > #include <linux/delay.h> > > diff --git a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c > index 054cac3..36848ee 100644 > --- a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c > +++ b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c > @@ -13,6 +13,8 @@ > * > */ > > +#include <linux/version.h> > +#include <crypto/aead.h> > #include <crypto/hash.h> > #include <linux/err.h> > #include <linux/module.h> > @@ -475,7 +477,11 @@ static int test_aead(struct crypto_aead *tfm, int enc, > aead_request_set_crypt(req, sg, sg, > template[i].ilen, iv); > > +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) > aead_request_set_assoc(req, asg, template[i].alen); > +#else > + aead_request_set_ad(req, template[i].alen); > +#endif I think this change is wrong. Compare it to the changes done in the upstream version this code is derived from: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=8a525fcd46751f8538c240baa4d37d55896c5a29 Do we need the extended testmgr.c code? otherwise I would just remove it. For me it looks like it was used to test the performance of the crypto engine and test the driver. > > ret = enc ? > crypto_aead_encrypt(req) : > @@ -616,7 +622,11 @@ static int test_aead(struct crypto_aead *tfm, int enc, > template[i].ilen, > iv); > > +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) > aead_request_set_assoc(req, asg, template[i].alen); > +#else > + aead_request_set_ad(req, template[i].alen); > +#endif > > ret = enc ? > crypto_aead_encrypt(req) : >
On 12/31/2015 11:28 AM, John Crispin wrote: > > > On 31/12/2015 10:51, Mathias Kresin wrote: >> Am 31.12.2015 um 08:12 schrieb John Crispin: >>> Hi >>> >>> On 31/12/2015 01:10, Martin Blumenstingl wrote: >>>> + >>>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) >>>> +#include <linux/scatterlist.h> >>>> +#else >>>> #include <asm/scatterlist.h> >>>> +#endif >>> >>> please just drop the old code. there is no need to be compatible to old >>> kernels. >>> >>> John >>> >> >> I guess we should keep the compatibility with Kernel 4.1 as long as this >> kernel version is the default for this target and/or available for this >> target. > > i was planning to jump straight to 4.4 > > John Linux 4.1 already has include/linux/scatterlist.h, I assume that this will also compile with linux 4.1 when you use #include <linux/scatterlist.h> Hauke
On 31/12/2015 14:42, Hauke Mehrtens wrote: > it. For me it looks like it was used to test the performance of the > crypto engine and test the driver. ralph added is and at the time i was important to lantiq for some reason beyond my knowledge. maybe you can find out if that requirement still exists. i agree that ideally we should drop it. John
On 31/12/2015 14:44, Hauke Mehrtens wrote: > > > On 12/31/2015 11:28 AM, John Crispin wrote: >> >> >> On 31/12/2015 10:51, Mathias Kresin wrote: >>> Am 31.12.2015 um 08:12 schrieb John Crispin: >>>> Hi >>>> >>>> On 31/12/2015 01:10, Martin Blumenstingl wrote: >>>>> + >>>>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) >>>>> +#include <linux/scatterlist.h> >>>>> +#else >>>>> #include <asm/scatterlist.h> >>>>> +#endif >>>> >>>> please just drop the old code. there is no need to be compatible to old >>>> kernels. >>>> >>>> John >>>> >>> >>> I guess we should keep the compatibility with Kernel 4.1 as long as this >>> kernel version is the default for this target and/or available for this >>> target. >> >> i was planning to jump straight to 4.4 >> >> John > > Linux 4.1 already has include/linux/scatterlist.h, I assume that this > will also compile with linux 4.1 when you use #include <linux/scatterlist.h> > > Hauke > anyone wanna try ? :) i am short on time the next 2-3 days and need to fight the backlog before i can start on new tasks. John
On 12/31/2015 02:51 PM, John Crispin wrote: > > > On 31/12/2015 14:44, Hauke Mehrtens wrote: >> >> >> On 12/31/2015 11:28 AM, John Crispin wrote: >>> >>> >>> On 31/12/2015 10:51, Mathias Kresin wrote: >>>> Am 31.12.2015 um 08:12 schrieb John Crispin: >>>>> Hi >>>>> >>>>> On 31/12/2015 01:10, Martin Blumenstingl wrote: >>>>>> + >>>>>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) >>>>>> +#include <linux/scatterlist.h> >>>>>> +#else >>>>>> #include <asm/scatterlist.h> >>>>>> +#endif >>>>> >>>>> please just drop the old code. there is no need to be compatible to old >>>>> kernels. >>>>> >>>>> John >>>>> >>>> >>>> I guess we should keep the compatibility with Kernel 4.1 as long as this >>>> kernel version is the default for this target and/or available for this >>>> target. >>> >>> i was planning to jump straight to 4.4 >>> >>> John >> >> Linux 4.1 already has include/linux/scatterlist.h, I assume that this >> will also compile with linux 4.1 when you use #include <linux/scatterlist.h> >> >> Hauke >> > > anyone wanna try ? :) i am short on time the next 2-3 days and need to > fight the backlog before i can start on new tasks. > > John Kernel 4.1 still builds without the ifdef and only using the linux/scatterlist.h include. Hauke
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h index 1d84da3..f030d62 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h @@ -54,7 +54,13 @@ #include <crypto/algapi.h> #include <linux/module.h> #include <linux/mm.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <linux/skbuff.h> #include <linux/netdevice.h> #include "ifxmips_deu.h" diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h index 62ad96d..32e055c 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h @@ -53,7 +53,13 @@ #include <crypto/algapi.h> #include <linux/module.h> #include <linux/mm.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <linux/skbuff.h> #include <linux/netdevice.h> #include "ifxmips_deu.h" diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h index 5198a4a..c376266 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h @@ -31,11 +31,18 @@ #ifndef IFXMIPS_DEU_DMA_H #define IFXMIPS_DEU_DMA_H +#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> #include <linux/crypto.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <asm/byteorder.h> #include <linux/skbuff.h> #include <linux/netdevice.h> diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h index d2cfd11..f801c24 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h @@ -54,7 +54,13 @@ #include <crypto/algapi.h> #include <linux/module.h> #include <linux/mm.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <linux/skbuff.h> #include <linux/netdevice.h> #include "ifxmips_deu.h" diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c index a5f5f90..e546a92 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c @@ -40,6 +40,7 @@ /* Project header */ +#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> @@ -48,7 +49,13 @@ #include <crypto/sha.h> #include <crypto/internal/hash.h> #include <linux/types.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <asm/byteorder.h> #if defined(CONFIG_DANUBE) diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c index a5a6c39..be16152 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c @@ -40,6 +40,7 @@ /* Project header */ +#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> @@ -47,7 +48,13 @@ #include <linux/cryptohash.h> #include <crypto/internal/hash.h> #include <linux/types.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#include <linux/scatterlist.h> +#else #include <asm/scatterlist.h> +#endif + #include <asm/byteorder.h> #include <linux/delay.h> diff --git a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c index 054cac3..36848ee 100644 --- a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c +++ b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c @@ -13,6 +13,8 @@ * */ +#include <linux/version.h> +#include <crypto/aead.h> #include <crypto/hash.h> #include <linux/err.h> #include <linux/module.h> @@ -475,7 +477,11 @@ static int test_aead(struct crypto_aead *tfm, int enc, aead_request_set_crypt(req, sg, sg, template[i].ilen, iv); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) aead_request_set_assoc(req, asg, template[i].alen); +#else + aead_request_set_ad(req, template[i].alen); +#endif ret = enc ? crypto_aead_encrypt(req) : @@ -616,7 +622,11 @@ static int test_aead(struct crypto_aead *tfm, int enc, template[i].ilen, iv); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) aead_request_set_assoc(req, asg, template[i].alen); +#else + aead_request_set_ad(req, template[i].alen); +#endif ret = enc ? crypto_aead_encrypt(req) :