diff options
| author |   Ben Greear <greearb@candelatech.com> | 2023-08-08 13:56:05 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2023-09-11 15:55:26 +0200 |
| commit | e8fbe99e87877f0412655f40d7c45bf8471470ac (patch) | |
| tree | 577896c27d3fd9277666dc005b0e0fc8c6fcdb7c /drivers/net/wireless/intel/iwlwifi/mvm/tx.c | |
| parent | wifi: iwlwifi: dbg_ini: fix structure packing (diff) | |
| download | wireguard-linux-e8fbe99e87877f0412655f40d7c45bf8471470ac.tar.xz wireguard-linux-e8fbe99e87877f0412655f40d7c45bf8471470ac.zip | |
wifi: iwlwifi: Ensure ack flag is properly cleared.
Debugging indicates that nothing else is clearing the info->flags,
so some frames were flagged as ACKed when they should not be.
Explicitly clear the ack flag to ensure this does not happen.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230808205605.4105670-1-greearb@candelatech.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 36d70d589aed..898dca393643 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -1612,6 +1612,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, iwl_trans_free_tx_cmd(mvm->trans, info->driver_data[1]); memset(&info->status, 0, sizeof(info->status)); + info->flags &= ~(IEEE80211_TX_STAT_ACK | IEEE80211_TX_STAT_TX_FILTERED); /* inform mac80211 about what happened with the frame */ switch (status & TX_STATUS_MSK) { @@ -1964,6 +1965,8 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid, */ if (!is_flush) info->flags |= IEEE80211_TX_STAT_ACK; + else + info->flags &= ~IEEE80211_TX_STAT_ACK; } /* |