aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-03-13 14:07:23 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-03-29 18:22:10 +0200
commitf0aff72c2bfae884b5482a288a191cc33a37f66b (patch)
treed5c0efca95fd641e3d523d25307103593de57114 /package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
parent94949801dec54892046f76e913273df529783cc1 (diff)
downloadupstream-f0aff72c2bfae884b5482a288a191cc33a37f66b.tar.gz
upstream-f0aff72c2bfae884b5482a288a191cc33a37f66b.tar.bz2
upstream-f0aff72c2bfae884b5482a288a191cc33a37f66b.zip
mac80211: Update to version 5.4.27
The removed patches are all integrated in the upstream version now. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch')
-rw-r--r--package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch b/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
index afd5e3eef0..155f4fc365 100644
--- a/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
+++ b/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
@@ -11,7 +11,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
--- a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
+++ b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
-@@ -104,6 +104,7 @@
+@@ -104,6 +104,7 @@ static void owl_fw_cb(const struct firmw
{
struct pci_dev *pdev = (struct pci_dev *)context;
struct owl_ctx *ctx = (struct owl_ctx *)pci_get_drvdata(pdev);
@@ -19,7 +19,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
struct pci_bus *bus;
complete(&ctx->eeprom_load);
-@@ -121,6 +122,16 @@
+@@ -119,6 +120,16 @@ static void owl_fw_cb(const struct firmw
goto release;
}
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
if (ath9k_pci_fixup(pdev, (const u16 *)fw->data, fw->size))
goto release;
-@@ -138,8 +149,14 @@
+@@ -138,8 +149,14 @@ release:
static const char *owl_get_eeprom_name(struct pci_dev *pdev)
{
struct device *dev = &pdev->dev;