aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-07-07 00:08:20 +0200
committerPetr Štetiar <ynezz@true.cz>2019-07-18 00:22:04 +0200
commit0b2c42ced21a7bc053e0d729f85041f1e3b54fbc (patch)
tree5b461df94bf6d46f2700310b3d27a7b5c39e3728 /package/kernel/mac80211/patches/subsys/130-disable-fils.patch
parentd616b2c906690d2e471144ca12b0a9ed28de21c2 (diff)
downloadupstream-0b2c42ced21a7bc053e0d729f85041f1e3b54fbc.tar.gz
upstream-0b2c42ced21a7bc053e0d729f85041f1e3b54fbc.tar.bz2
upstream-0b2c42ced21a7bc053e0d729f85041f1e3b54fbc.zip
mac80211: Update to version 5.2-rc7
This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/130-disable-fils.patch')
-rw-r--r--package/kernel/mac80211/patches/subsys/130-disable-fils.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/subsys/130-disable-fils.patch b/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
index f1163764a0..dd1ccc8597 100644
--- a/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
+++ b/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
@@ -2,7 +2,7 @@ Disable FILS support, since it pulls in crypto hash support
--- a/net/mac80211/fils_aead.h
+++ b/net/mac80211/fils_aead.h
-@@ -10,7 +10,7 @@
+@@ -7,7 +7,7 @@
#ifndef FILS_AEAD_H
#define FILS_AEAD_H
@@ -16,9 +16,9 @@ Disable FILS support, since it pulls in crypto hash support
@@ -1,4 +1,4 @@
-#if LINUX_VERSION_IS_GEQ(4,3,0)
+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
+ // SPDX-License-Identifier: GPL-2.0-only
/*
* FILS AEAD for (Re)Association Request/Response frames
- * Copyright 2016, Qualcomm Atheros, Inc.
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -570,7 +570,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_