1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index f0e96a927407..e05440d90319 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -91,11 +91,10 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
                 tx_flags |= TX_CMD_FLG_ACK | TX_CMD_FLG_BAR;
 
         /* High prio packet (wrt. BT coex) if it is EAPOL, MCAST or MGMT */
-        if (info->band == IEEE80211_BAND_2GHZ        &&
-            (skb->protocol == cpu_to_be16(ETH_P_PAE)  ||
-             is_multicast_ether_addr(hdr->addr1)      ||
-             ieee80211_is_back_req(fc)                ||
-             ieee80211_is_mgmt(fc)))
+        if (info->band == IEEE80211_BAND_2GHZ &&
+            (info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO ||
+             is_multicast_ether_addr(hdr->addr1) ||
+             ieee80211_is_back_req(fc) || ieee80211_is_mgmt(fc)))
                 tx_flags |= TX_CMD_FLG_BT_DIS;
 
         if (ieee80211_has_morefrags(fc))
@@ -123,6 +122,8 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
                  * it
                  */
                 WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_AMPDU);
+        } else if (skb->protocol == cpu_to_be16(ETH_P_PAE)) {
+                tx_cmd->pm_frame_timeout = cpu_to_le16(2);
         } else {
                 tx_cmd->pm_frame_timeout = 0;
         }
@@ -171,7 +172,7 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,
         }
 
         /*
-         * for data packets, rate info comes from the table inside he fw. This
+         * for data packets, rate info comes from the table inside the fw. This
          * table is controlled by LINK_QUALITY commands
          */