aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-11-21 22:20:20 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-11-22 20:35:54 +0100
commita36c464efeffff4d4b1431cf6391dcde38c84e8b (patch)
treed6e73a6903d653e9a8784347ab902d9a89bcdeef /package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch
parent103e49f62e72664ee0d5285007907a75960e8645 (diff)
downloadupstream-a36c464efeffff4d4b1431cf6391dcde38c84e8b.tar.gz
upstream-a36c464efeffff4d4b1431cf6391dcde38c84e8b.tar.bz2
upstream-a36c464efeffff4d4b1431cf6391dcde38c84e8b.zip
mac80211: update to version 5.4-rc8
This updates mac80211 to backports based on kernel 5.4-rc8. The deleted patches were applied upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch')
-rw-r--r--package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch b/package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch
deleted file mode 100644
index 7691522e73..0000000000
--- a/package/kernel/mac80211/patches/build/101-backport-add-pci_disable_link_state-wrapper-with-ret.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 28 Oct 2019 15:20:40 +0100
-Subject: [PATCH] backport: add pci_disable_link_state wrapper with return code
-
-The signature of pci_disable_link_state was changed to indicate if the state
-was successfully disabled. Since the old version did not have this, add a
-wrapper which checks the pcie register to determine the return code
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/backport-include/linux/pci.h
-+++ b/backport-include/linux/pci.h
-@@ -240,4 +240,29 @@ static inline struct pci_dev *pcie_find_
- (PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX)
- #endif
-
-+#if defined(CONFIG_PCI) && LINUX_VERSION_IS_LESS(5,3,0)
-+
-+static inline int
-+LINUX_BACKPORT(pci_disable_link_state)(struct pci_dev *pdev, int state)
-+{
-+ u16 aspmc;
-+
-+ pci_disable_link_state(pdev, state);
-+
-+ pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &aspmc);
-+ if ((state & PCIE_LINK_STATE_L0S) &&
-+ (aspmc & PCI_EXP_LNKCTL_ASPM_L0S))
-+ return -EPERM;
-+
-+ if ((state & PCIE_LINK_STATE_L1) &&
-+ (aspmc & PCI_EXP_LNKCTL_ASPM_L1))
-+ return -EPERM;
-+
-+ return 0;
-+}
-+
-+#define pci_disable_link_state LINUX_BACKPORT(pci_disable_link_state)
-+
-+#endif
-+
- #endif /* _BACKPORT_LINUX_PCI_H */