Merge tag 'wireless-drivers-for-davem-2018-05-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.17

Two last minute fixes, hopefully they make it to 4.17 still.

rt2x00

* revert a fix which caused even more problems

iwlwifi

* fix a crash when there are 16 or more logical CPUs
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index f8a0234d332c..5517ea4c2aa0 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -1590,14 +1590,13 @@ static void iwl_pcie_set_interrupt_capa(struct pci_dev *pdev,
                                         struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        int max_irqs, num_irqs, i, ret, nr_online_cpus;
+        int max_irqs, num_irqs, i, ret;
         u16 pci_cmd;
 
         if (!trans->cfg->mq_rx_supported)
                 goto enable_msi;
 
-        nr_online_cpus = num_online_cpus();
-        max_irqs = min_t(u32, nr_online_cpus + 2, IWL_MAX_RX_HW_QUEUES);
+        max_irqs = min_t(u32, num_online_cpus() + 2, IWL_MAX_RX_HW_QUEUES);
         for (i = 0; i < max_irqs; i++)
                 trans_pcie->msix_entries[i].entry = i;
 
@@ -1623,16 +1622,17 @@ static void iwl_pcie_set_interrupt_capa(struct pci_dev *pdev,
          * Two interrupts less: non rx causes shared with FBQ and RSS.
          * More than two interrupts: we will use fewer RSS queues.
          */
-        if (num_irqs <= nr_online_cpus) {
+        if (num_irqs <= max_irqs - 2) {
                 trans_pcie->trans->num_rx_queues = num_irqs + 1;
                 trans_pcie->shared_vec_mask = IWL_SHARED_IRQ_NON_RX |
                         IWL_SHARED_IRQ_FIRST_RSS;
-        } else if (num_irqs == nr_online_cpus + 1) {
+        } else if (num_irqs == max_irqs - 1) {
                 trans_pcie->trans->num_rx_queues = num_irqs;
                 trans_pcie->shared_vec_mask = IWL_SHARED_IRQ_NON_RX;
         } else {
                 trans_pcie->trans->num_rx_queues = num_irqs - 1;
         }
+        WARN_ON(trans_pcie->trans->num_rx_queues > IWL_MAX_RX_HW_QUEUES);
 
         trans_pcie->alloc_vecs = num_irqs;
         trans_pcie->msix_enabled = true;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
index a6884e73d2ab..7ddee980048b 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
@@ -372,16 +372,15 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
 
         /*
          * Determine IFS values
-         * - Use TXOP_BACKOFF for probe and management frames except beacons
+         * - Use TXOP_BACKOFF for management frames except beacons
          * - Use TXOP_SIFS for fragment bursts
          * - Use TXOP_HTTXOP for everything else
          *
          * Note: rt2800 devices won't use CTS protection (if used)
          * for frames not transmitted with TXOP_HTTXOP
          */
-        if ((ieee80211_is_mgmt(hdr->frame_control) &&
-             !ieee80211_is_beacon(hdr->frame_control)) ||
-            (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
+        if (ieee80211_is_mgmt(hdr->frame_control) &&
+            !ieee80211_is_beacon(hdr->frame_control))
                 txdesc->u.ht.txop = TXOP_BACKOFF;
         else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))
                 txdesc->u.ht.txop = TXOP_SIFS;