diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-18 15:09:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-18 15:09:58 -0500 |
| commit | 623c43875f496fdd3fc0e6288bd0e06aa2b63c9d (patch) | |
| tree | 8479dcd1a8f8f294de0d90a6e96f0ca9741f2383 /drivers/net/wireless/iwlwifi/mvm/sta.c | |
| parent | 204e35a91c4b3327b7239d7687fbd4923edbbf08 (diff) | |
| parent | cf4ef65446443eb485afe9419ea82b2efbe582a7 (diff) | |
| download | linux-623c43875f496fdd3fc0e6288bd0e06aa2b63c9d.tar.gz linux-623c43875f496fdd3fc0e6288bd0e06aa2b63c9d.tar.bz2 linux-623c43875f496fdd3fc0e6288bd0e06aa2b63c9d.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 026c2e06c46f..0a8af2083ddc 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c @@ -939,19 +939,6 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, IWL_DEBUG_HT(mvm, "Tx aggregation enabled on ra = %pM tid = %d\n", sta->addr, tid); - if (mvm->cfg->ht_params->use_rts_for_aggregation) { - /* - * switch to RTS/CTS if it is the prefer protection - * method for HT traffic - * this function also sends the LQ command - */ - return iwl_mvm_tx_protection(mvm, mvmsta, true); - /* - * TODO: remove the TLC_RTS flag when we tear down the last - * AGG session (agg_tids_count in DVM) - */ - } - return iwl_mvm_send_lq_cmd(mvm, &mvmsta->lq_sta.lq, false); } @@ -1130,8 +1117,8 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm, memcpy(cmd.key, keyconf->key, keyconf->keylen); break; default: - WARN_ON(1); - return -EINVAL; + key_flags |= cpu_to_le16(STA_KEY_FLG_EXT); + memcpy(cmd.key, keyconf->key, keyconf->keylen); } if (!(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE)) @@ -1295,8 +1282,8 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 0, NULL, CMD_SYNC); break; default: - IWL_ERR(mvm, "Unknown cipher %x\n", keyconf->cipher); - ret = -EINVAL; + ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, + sta_id, 0, NULL, CMD_SYNC); } if (ret) |