From 43e4bf13df48cdc38b6989783189375a67f2b1be Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 6 Sep 2018 06:41:11 +0200 Subject: [PATCH] backport: v4.19 compat patches Signed-off-by: John Crispin --- patches/0099-compat.patch | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 patches/0099-compat.patch diff --git a/patches/0099-compat.patch b/patches/0099-compat.patch new file mode 100644 index 000000000000..cb1b851fce94 --- /dev/null +++ b/patches/0099-compat.patch @@ -0,0 +1,71 @@ +From d943f15647cfd7e72c3547ef1af6b942572fc57a Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Wed, 5 Sep 2018 16:14:07 +0200 +Subject: [PATCH] backport: v4.18.5 compat patches + +make backport work for v4.18.5 ontop of +a87d6c57a9d95390f89cc4092099171c01520404 + +Signed-off-by: John Crispin +--- + backport-include/linux/device.h | 4 + + backport-include/linux/firmware.h | 4 + + backport-include/linux/overflow.h | 278 +++++++++++++++++++++ + backport-include/net/rsi_91x.h | 61 +++++ + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/mcu.c | 4 +- + 8 files changed, 352 insertions(+), 5 deletions(-) + create mode 100644 backport-include/linux/overflow.h + create mode 100644 backport-include/net/rsi_91x.h + +diff --git a/backport-include/linux/device.h b/backport-include/linux/device.h +index 8f282ca..80041ad 100644 +diff --git a/backport-include/linux/firmware.h b/backport-include/linux/firmware.h +index 186eec3..ab8e94f 100644 +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +index 4fffa69..b489bbd 100644 +diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c +index 248b7b3..078929c 100644 +diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c +index dfdcbc4..0657836 100644 +diff --git a/drivers/net/wireless/mediatek/mt7601u/mcu.c b/drivers/net/wireless/mediatek/mt7601u/mcu.c +index 61705f6..bdcfc1a 100644 +-- +2.11.0 + + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +@@ -2050,7 +2050,7 @@ static struct pci_driver brcmf_pciedrvr + #ifdef CONFIG_PM + .driver.pm = &brcmf_pciedrvr_pm, + #endif +- .driver.coredump = brcmf_dev_coredump, ++// .driver.coredump = brcmf_dev_coredump, + }; + + +--- a/drivers/net/wireless/marvell/mwifiex/pcie.c ++++ b/drivers/net/wireless/marvell/mwifiex/pcie.c +@@ -429,7 +429,7 @@ static struct pci_driver __refdata mwifi + .probe = mwifiex_pcie_probe, + .remove = mwifiex_pcie_remove, + .driver = { +- .coredump = mwifiex_pcie_coredump, ++ //.coredump = mwifiex_pcie_coredump, + #ifdef CONFIG_PM_SLEEP + .pm = &mwifiex_pcie_pm_ops, + #endif +--- a/drivers/net/wireless/marvell/mwifiex/sdio.c ++++ b/drivers/net/wireless/marvell/mwifiex/sdio.c +@@ -526,7 +526,7 @@ static struct sdio_driver mwifiex_sdio = + .remove = mwifiex_sdio_remove, + .drv = { + .owner = THIS_MODULE, +- .coredump = mwifiex_sdio_coredump, ++ //.coredump = mwifiex_sdio_coredump, + .pm = &mwifiex_sdio_pm_ops, + } + }; -- 2.30.2