summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-11-16 15:38:55 +0100
committerJohannes Berg <johannes.berg@intel.com>2017-11-17 10:46:20 +0100
commit662da74dff753be0da8ecc8a66a52484f4f3b7d7 (patch)
tree6986815f846f3742c9b17d3c016d475b5f8431f6
parent47a8c0a144b873ca62ef6d000286464db0519292 (diff)
backports: fix missing linux/verification.h error on < 4.7
Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--backport/backport-include/linux/verification.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/backport/backport-include/linux/verification.h b/backport/backport-include/linux/verification.h
index 10e1bcfb..5fd0a2d3 100644
--- a/backport/backport-include/linux/verification.h
+++ b/backport/backport-include/linux/verification.h
@@ -1,7 +1,7 @@
#ifndef __BP_VERIFICATION_H
#define __BP_VERIFICATION_H
#include <linux/version.h>
-#ifndef CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION
+#if LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION)
#include_next <linux/verification.h>
#else
#include <linux/key.h>
@@ -24,5 +24,5 @@ extern int verify_pkcs7_signature(const void *data, size_t len,
const void *data, size_t len,
size_t asn1hdrlen),
void *ctx);
-#endif /* LINUX_VERSION_IS_GEQ(4,7,0) */
+#endif /* LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) */
#endif /* __BP_VERIFICATION_H */