diff options
author | Christian Lamparter <chunkeey@gmail.com> | 2021-08-21 00:39:47 +0200 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2021-08-26 21:37:19 +0200 |
commit | d24efa92e1c0918526c6eae6c2f2e98ec1a8c048 (patch) | |
tree | a7347ef122633571d47a004242498b6a505eb363 | |
parent | a1bd8109f02e3d8ef66a2f79ab8078055d7cd0b1 (diff) | |
download | upstream-d24efa92e1c0918526c6eae6c2f2e98ec1a8c048.tar.gz upstream-d24efa92e1c0918526c6eae6c2f2e98ec1a8c048.tar.bz2 upstream-d24efa92e1c0918526c6eae6c2f2e98ec1a8c048.zip |
ath9k: owl-loader: remove obsolete AR71XX patch
this is no longer necessary as the AR71XX target
was superseded by ath79.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-rw-r--r-- | package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch | 53 |
1 files changed, 0 insertions, 53 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 deleted file mode 100644 index d1d6c9e2e3..0000000000 --- a/package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Christian Lamparter <chunkeey@gmail.com> -Date: Sat, 16 Nov 2019 19:25:24 +0100 -Subject: [PATCH] owl_loader: compatibility patch - -This patch includes OpenWrt specific changes that are -not included in the upstream owl-loader. - -This includes a platform data handling changes for ar71xx. - -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 -@@ -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); -+ struct ath9k_platform_data *pdata = dev_get_platdata(&pdev->dev); - struct pci_bus *bus; - - complete(&ctx->eeprom_load); -@@ -118,6 +119,16 @@ static void owl_fw_cb(const struct firmw - goto release; - } - -+ if (pdata) { -+ memcpy(pdata->eeprom_data, fw->data, fw->size); -+ -+ /* -+ * eeprom has been successfully loaded - pass the data to ath9k -+ * but remove the eeprom_name, so it doesn't try to load it too. -+ */ -+ pdata->eeprom_name = NULL; -+ } -+ - if (ath9k_pci_fixup(pdev, (const u16 *)fw->data, fw->size)) - goto release; - -@@ -137,8 +148,14 @@ release: - static const char *owl_get_eeprom_name(struct pci_dev *pdev) - { - struct device *dev = &pdev->dev; -+ struct ath9k_platform_data *pdata; - char *eeprom_name; - -+ /* try the existing platform data first */ -+ pdata = dev_get_platdata(dev); -+ if (pdata && pdata->eeprom_name) -+ return pdata->eeprom_name; -+ - dev_dbg(dev, "using auto-generated eeprom filename\n"); - - eeprom_name = devm_kzalloc(dev, EEPROM_FILENAME_LEN, GFP_KERNEL); |