summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-26 19:00:01 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-02 19:34:50 +0200
commit67a7daa938671a5c7006e5d689c297a26499d75c (patch)
treec11db1b831745bcc356f105f421cefbba938cb41 /package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
parentde165b66be47497906d3cf4f1ca6071ee25e2003 (diff)
downloadmaster-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.tar.gz
master-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.tar.bz2
master-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.zip
mac80211: update to wireless-testing 2016-06-20
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch')
-rw-r--r--package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
new file mode 100644
index 0000000000..38b31795a4
--- /dev/null
+++ b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
@@ -0,0 +1,11 @@
+--- a/compat/Makefile
++++ b/compat/Makefile
+@@ -35,8 +35,6 @@ compat-$(CPTCFG_KERNEL_4_6) += backport-
+
+ compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
+ compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
+-skcipher-objs += crypto-skcipher.o
+-obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o
+ compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o
+ compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
+ cordic-objs += lib-cordic.o