diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-02-29 17:19:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-02-29 17:19:04 +0000 |
commit | f3a1db04f0ebba577598f1577d3c8c756c8bf757 (patch) | |
tree | eecfe6c9154a9e0717573daba16d1c58bd674d2e /package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch | |
parent | 5db86ba649298bef0066cac8e4d0e17834f6b7b0 (diff) | |
download | upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.gz upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.bz2 upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.zip |
mac80211: backport from trunk r48782 + required kernel patches and mt76, mwlwifi
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48822 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch')
-rw-r--r-- | package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch b/package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch deleted file mode 100644 index 50302975ef..0000000000 --- a/package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Hante Meuleman <meuleman@broadcom.com> -Date: Thu, 29 Oct 2015 20:33:14 +0100 -Subject: [PATCH] brcmfmac: Remove unncessary variable irq_requested. - -The variable irq_requested is unneeded as the functionality -it is providing, is also provided by the variable irq_allocated. - -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> -Signed-off-by: Hante Meuleman <meuleman@broadcom.com> -Signed-off-by: Arend van Spriel <arend@broadcom.com> -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - ---- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c -+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c -@@ -257,7 +257,6 @@ struct brcmf_pcie_core_info { - struct brcmf_pciedev_info { - enum brcmf_pcie_state state; - bool in_irq; -- bool irq_requested; - struct pci_dev *pdev; - char fw_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN]; - char nvram_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN]; -@@ -889,7 +888,6 @@ static int brcmf_pcie_request_irq(struct - - brcmf_dbg(PCIE, "Enter\n"); - /* is it a v1 or v2 implementation */ -- devinfo->irq_requested = false; - pci_enable_msi(pdev); - if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) { - if (request_threaded_irq(pdev->irq, -@@ -912,7 +910,6 @@ static int brcmf_pcie_request_irq(struct - return -EIO; - } - } -- devinfo->irq_requested = true; - devinfo->irq_allocated = true; - return 0; - } -@@ -930,9 +927,6 @@ static void brcmf_pcie_release_irq(struc - pdev = devinfo->pdev; - - brcmf_pcie_intr_disable(devinfo); -- if (!devinfo->irq_requested) -- return; -- devinfo->irq_requested = false; - free_irq(pdev->irq, devinfo); - pci_disable_msi(pdev); - |