aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/mwl
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-04 23:48:20 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-23 23:17:23 +0200
commite185080c871a712a41ef02f6b20f1d07d2f1ab87 (patch)
treeb9f8357e17ec60f543a646fab1c38e819a048b44 /package/kernel/mac80211/patches/mwl
parenta1d3796efebd6685ad34c9f95b67eca3486ebf3e (diff)
downloadupstream-e185080c871a712a41ef02f6b20f1d07d2f1ab87.tar.gz
upstream-e185080c871a712a41ef02f6b20f1d07d2f1ab87.tar.bz2
upstream-e185080c871a712a41ef02f6b20f1d07d2f1ab87.zip
mac80211: Update to version 5.11.22-1
The removed patches were applied upstream. This backports version 5.11.22 and later does not support kernel versions < 4.4, this allows us to remove some patches too. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/mwl')
-rw-r--r--package/kernel/mac80211/patches/mwl/700-mwl8k-missing-pci-id-for-WNR854T.patch2
-rw-r--r--package/kernel/mac80211/patches/mwl/940-mwl8k_init_devices_synchronously.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/mwl/700-mwl8k-missing-pci-id-for-WNR854T.patch b/package/kernel/mac80211/patches/mwl/700-mwl8k-missing-pci-id-for-WNR854T.patch
index d358cfe367..87bb42dce5 100644
--- a/package/kernel/mac80211/patches/mwl/700-mwl8k-missing-pci-id-for-WNR854T.patch
+++ b/package/kernel/mac80211/patches/mwl/700-mwl8k-missing-pci-id-for-WNR854T.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
-@@ -5695,6 +5695,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
+@@ -5700,6 +5700,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API));
static const struct pci_device_id mwl8k_pci_id_table[] = {
diff --git a/package/kernel/mac80211/patches/mwl/940-mwl8k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/mwl/940-mwl8k_init_devices_synchronously.patch
index a35cf1875a..ff12950e5f 100644
--- a/package/kernel/mac80211/patches/mwl/940-mwl8k_init_devices_synchronously.patch
+++ b/package/kernel/mac80211/patches/mwl/940-mwl8k_init_devices_synchronously.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
-@@ -6280,6 +6280,8 @@ static int mwl8k_probe(struct pci_dev *p
+@@ -6286,6 +6286,8 @@ static int mwl8k_probe(struct pci_dev *p
priv->running_bsses = 0;
@@ -9,7 +9,7 @@
return rc;
err_stop_firmware:
-@@ -6313,8 +6315,6 @@ static void mwl8k_remove(struct pci_dev
+@@ -6319,8 +6321,6 @@ static void mwl8k_remove(struct pci_dev
return;
priv = hw->priv;