diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-09-14 13:54:42 +0400 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-09-14 13:54:42 +0400 |
| commit | 71511c866bce04f931e462ad0cce3f122aa0c447 (patch) | |
| tree | 83713e5e695f04bcbdfbf69818ca03d01c4ddc45 /drivers/net/wireless/iwlwifi/mvm/tx.c | |
| parent | 712b24adc105518f7cbbb6f9f353efea48954bb9 (diff) | |
| parent | 2cddddc56a1179aa71b460ad616176c237d4a243 (diff) | |
| download | linux-71511c866bce04f931e462ad0cce3f122aa0c447.tar.xz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index 963edb8656ad..ed0919465e0e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -170,10 +170,14 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, /* * for data packets, rate info comes from the table inside the fw. This - * table is controlled by LINK_QUALITY commands + * table is controlled by LINK_QUALITY commands. Exclude ctrl port + * frames like EAPOLs which should be treated as mgmt frames. This + * avoids them being sent initially in high rates which increases the + * chances for completion of the 4-Way handshake. */ - if (ieee80211_is_data(fc) && sta) { + if (ieee80211_is_data(fc) && sta && + !(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO)) { tx_cmd->initial_rate_index = 0; tx_cmd->tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE); return; |