iwlagn: Support flush queues for specified interface

Flush command can target specified interface or all interfaces

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 8bed3ae1196f..99d473f527d5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1530,10 +1530,12 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
         might_sleep();
 
         memset(&flush_cmd, 0, sizeof(flush_cmd));
-        flush_cmd.fifo_control = IWL_SCD_VO_MSK | IWL_SCD_VI_MSK |
+        if (flush_control & BIT(IWL_RXON_CTX_BSS))
+                flush_cmd.fifo_control = IWL_SCD_VO_MSK | IWL_SCD_VI_MSK |
                                  IWL_SCD_BE_MSK | IWL_SCD_BK_MSK |
                                  IWL_SCD_MGMT_MSK;
-        if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))
+        if ((flush_control & BIT(IWL_RXON_CTX_PAN)) &&
+            (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)))
                 flush_cmd.fifo_control |= IWL_PAN_SCD_VO_MSK |
                                 IWL_PAN_SCD_VI_MSK | IWL_PAN_SCD_BE_MSK |
                                 IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 189bc181c36d..8a2edf8dce32 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -991,8 +991,7 @@ struct iwl_rem_sta_cmd {
 #define IWL_AGG_TX_QUEUE_MSK            cpu_to_le32(0xffc00)
 
 #define IWL_DROP_SINGLE         0
-#define IWL_DROP_SELECTED       1
-#define IWL_DROP_ALL            2
+#define IWL_DROP_ALL            (BIT(IWL_RXON_CTX_BSS) | BIT(IWL_RXON_CTX_PAN))
 
 /*
  * REPLY_TXFIFO_FLUSH = 0x1e(command and response)