diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-08 12:57:26 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-18 11:04:19 -0400 |
commit | ecdbe86eda74005d1b4bc8387e1825ad95fab705 (patch) | |
tree | 852d02ad949b0605f266910af5219f7230f258da /drivers/net | |
parent | f88e0ecc896f91d6965ba2935dcdf2280044a30a (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 3 |
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 8bed3ae1196..99d473f527d 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) | |||
1530 | might_sleep(); | 1530 | might_sleep(); |
1531 | 1531 | ||
1532 | memset(&flush_cmd, 0, sizeof(flush_cmd)); | 1532 | memset(&flush_cmd, 0, sizeof(flush_cmd)); |
1533 | flush_cmd.fifo_control = IWL_SCD_VO_MSK | IWL_SCD_VI_MSK | | 1533 | if (flush_control & BIT(IWL_RXON_CTX_BSS)) |
1534 | flush_cmd.fifo_control = IWL_SCD_VO_MSK | IWL_SCD_VI_MSK | | ||
1534 | IWL_SCD_BE_MSK | IWL_SCD_BK_MSK | | 1535 | IWL_SCD_BE_MSK | IWL_SCD_BK_MSK | |
1535 | IWL_SCD_MGMT_MSK; | 1536 | IWL_SCD_MGMT_MSK; |
1536 | if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)) | 1537 | if ((flush_control & BIT(IWL_RXON_CTX_PAN)) && |
1538 | (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))) | ||
1537 | flush_cmd.fifo_control |= IWL_PAN_SCD_VO_MSK | | 1539 | flush_cmd.fifo_control |= IWL_PAN_SCD_VO_MSK | |
1538 | IWL_PAN_SCD_VI_MSK | IWL_PAN_SCD_BE_MSK | | 1540 | IWL_PAN_SCD_VI_MSK | IWL_PAN_SCD_BE_MSK | |
1539 | IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK | | 1541 | 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 189bc181c36..8a2edf8dce3 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 { | |||
991 | #define IWL_AGG_TX_QUEUE_MSK cpu_to_le32(0xffc00) | 991 | #define IWL_AGG_TX_QUEUE_MSK cpu_to_le32(0xffc00) |
992 | 992 | ||
993 | #define IWL_DROP_SINGLE 0 | 993 | #define IWL_DROP_SINGLE 0 |
994 | #define IWL_DROP_SELECTED 1 | 994 | #define IWL_DROP_ALL (BIT(IWL_RXON_CTX_BSS) | BIT(IWL_RXON_CTX_PAN)) |
995 | #define IWL_DROP_ALL 2 | ||
996 | 995 | ||
997 | /* | 996 | /* |
998 | * REPLY_TXFIFO_FLUSH = 0x1e(command and response) | 997 | * REPLY_TXFIFO_FLUSH = 0x1e(command and response) |