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:26:51 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-05-21 14:39:34 +0200
commit9ca21dc7d59e2e0c7f97e440e71ea93c5275219b (patch)
tree8e27217bd2727625432c9c0c28ef39fcdd0639aa /package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
parenta4b50c4bce7b015c9d7c7d599ea29994a55f3f1f (diff)
downloadupstream-9ca21dc7d59e2e0c7f97e440e71ea93c5275219b.tar.gz
upstream-9ca21dc7d59e2e0c7f97e440e71ea93c5275219b.tar.bz2
upstream-9ca21dc7d59e2e0c7f97e440e71ea93c5275219b.zip
mac80211: Update to version 5.5.19
This updates the mac80211 backport. The removed patches are already integrated in the upstream version. 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 155f4fc365..d1d6c9e2e3 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 @@ static void owl_fw_cb(const struct firmw
+@@ -103,6 +103,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);
-@@ -119,6 +120,16 @@ static void owl_fw_cb(const struct firmw
+@@ -118,6 +119,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 @@ release:
+@@ -137,8 +148,14 @@ release:
static const char *owl_get_eeprom_name(struct pci_dev *pdev)
{
struct device *dev = &pdev->dev;