Greg Kroah-Hartman wrote:

From: Jiri Kosina <redacted>

commit e7020bb068d8be50a92f48e36b236a1a1ef9282e upstream.

Analogically to what we did in 2800aadc18a6 ("iwlwifi: Fix softirq/hardirq
disabling in iwl_pcie_enqueue_hcmd()"), we must apply the same fix to
iwl_pcie_gen2_enqueue_hcmd(), as it's being called from exactly the same
contexts.

Greg,
This patch and above mentioned earlier patch
"iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd()",
upstream commit 2800aadc18a64c96b051bcb7da8a7df7d505db3f, both need
to be backported to older kernels too.

I see that there are trivial context rejects if/when you attempt to
apply those patches to older kernels. Those trivial context rejects
should not prevent backporting them. Maybe run both patches through sed?

sed -e s/iwl_txq_space/iwl_queue_space/ -e s/iwl_txq_get_/iwl_pcie_get_/

My ability test in-tree iwlwifi is limited. I compile out-of-tree
iwlwifi source, and testing that is limited to pinging mobile-wifi
router that does not have SIM-card.

-- 
Jari Ruusu  4096R/8132F189 12D6 4C3A DCDA 0AA4 27BD  ACDF F073 3C80 8132 F189