diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-05 11:05:44 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-05 11:05:44 -0500 |
| commit | cbec0627ef1adf7afa448e8bbae3146ce910212a (patch) | |
| tree | 0a0956e19fb28c6eace2d445b1603afc2fd260ca /drivers/net/wireless/iwlwifi/iwl-agn-sta.c | |
| parent | f61759e6b831a55b89e584b198c3da325e2bc379 (diff) | |
| parent | 9995ffe5f5fdddcc73e4465cc3f8b38714df8108 (diff) | |
| download | op-kernel-dev-cbec0627ef1adf7afa448e8bbae3146ce910212a.zip op-kernel-dev-cbec0627ef1adf7afa448e8bbae3146ce910212a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 ed62836..4b2aa1d 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, |
