aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-16 10:49:42 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-16 10:52:24 +0200
commit34b05087f73dce512dd6df9f1b755bc70fd5b74a (patch)
treef5d45bb2d1207ef2b6770427ed161d37ce5449c4
parent474d62e31db9e72c855736eca3fae8d341b7275c (diff)
downloadupstream-34b05087f73dce512dd6df9f1b755bc70fd5b74a.tar.gz
upstream-34b05087f73dce512dd6df9f1b755bc70fd5b74a.tar.bz2
upstream-34b05087f73dce512dd6df9f1b755bc70fd5b74a.zip
mac80211: fix a module build/dependency issue that was breaking lib80211
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch b/package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch
new file mode 100644
index 0000000000..38b31795a4
--- /dev/null
+++ b/package/kernel/mac80211/patches/007-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