Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136151
b: refs/heads/master
c: 43da919
h: refs/heads/master
i:
  136149: 3a65492
  136147: a0f9b93
  136143: 5b6428b
v: v3
  • Loading branch information
Abhijeet Kolekar authored and John W. Linville committed Mar 28, 2009
1 parent 874a16a commit cc353af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a2f1cbebdccc866d6c7da9eb655d35b5c60d33a0
refs/heads/master: 43da9192326a4499b5faf737c3636f25b56b53e0
6 changes: 3 additions & 3 deletions trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,14 @@ static int iwl3945_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
memcpy(priv->stations_39[sta_id].sta.key.key, keyconf->key,
keyconf->keylen);

if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
if ((priv->stations_39[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
== STA_KEY_FLG_NO_ENC)
priv->stations[sta_id].sta.key.key_offset =
priv->stations_39[sta_id].sta.key.key_offset =
iwl_get_free_ucode_key_index(priv);
/* else, we are overriding an existing key => no need to allocated room
* in uCode. */

WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
WARN(priv->stations_39[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
"no space for a new key");

priv->stations_39[sta_id].sta.key.key_flags = key_flags;
Expand Down

0 comments on commit cc353af

Please sign in to comment.