From 4c0a53ddea49f6323b6e0da20936d62761235159 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 5 Jan 2014 09:18:04 +0200 Subject: [PATCH] backports: fix iwlwifi threaded IRQ patches Modifications upstream affected: * drivers_net_wireless_iwlwifi_pcie_internal.patch * drivers_net_wireless_iwlwifi_pcie_trans.patch Manually refresh the patches. Change-Id: Iad8218a243e644352c3b1029d12795c528259dde Signed-off-by: Emmanuel Grumbach Signed-off-by: Hauke Mehrtens --- .../drivers_net_wireless_iwlwifi_pcie_internal.patch | 4 ++-- .../drivers_net_wireless_iwlwifi_pcie_trans.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch index ef0df1f23cdd..b12b28d78ea5 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch @@ -1,9 +1,9 @@ --- a/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -311,6 +311,9 @@ struct iwl_trans_pcie { - +@@ -312,6 +312,9 @@ struct iwl_trans_pcie { /*protect hw register */ spinlock_t reg_lock; + bool cmd_in_flight; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) + struct compat_threaded_irq irq_compat; +#endif diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch index 34f8040abbe0..69a1c865c7f0 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -899,12 +899,21 @@ void iwl_trans_pcie_free(struct iwl_tran +@@ -878,12 +878,21 @@ void iwl_trans_pcie_free(struct iwl_tran { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -22,17 +22,17 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1597,9 +1606,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1584,9 +1593,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) + err = compat_request_threaded_irq(&trans_pcie->irq_compat, -+ pdev->irq, iwl_pcie_isr_ict, ++ pdev->irq, iwl_pcie_isr, + iwl_pcie_irq_handler, + IRQF_SHARED, DRV_NAME, trans); +#else - err = request_threaded_irq(pdev->irq, iwl_pcie_isr_ict, + err = request_threaded_irq(pdev->irq, iwl_pcie_isr, iwl_pcie_irq_handler, IRQF_SHARED, DRV_NAME, trans); +#endif -- 2.30.2