diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-05 22:23:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-05 22:23:14 +0400 |
| commit | 321f3b8708e853695a4ff4a1a95b6fa0965b06e5 (patch) | |
| tree | 0fd46721f5620710b079109b31a458573c1b3902 /drivers/net/wireless/iwlwifi/iwl-agn-sta.c | |
| parent | de398fb8b92eba3447298053a483727bdd5fe37e (diff) | |
| parent | cbec0627ef1adf7afa448e8bbae3146ce910212a (diff) | |
| download | linux-321f3b8708e853695a4ff4a1a95b6fa0965b06e5.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index ed6283623932..4b2aa1da0953 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -1268,9 +1268,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, switch (keyconf->cipher) { case WLAN_CIPHER_SUITE_TKIP: - keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; - keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; - if (sta) addr = sta->addr; else /* station mode case only */ @@ -1283,8 +1280,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, seq.tkip.iv32, p1k, CMD_SYNC); break; case WLAN_CIPHER_SUITE_CCMP: - keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; - /* fall through */ case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: ret = iwlagn_send_sta_key(priv, keyconf, sta_id, |