--- linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-sta.c.orig	2008-10-20 10:31:31.000000000 -0400
+++ linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-sta.c	2008-10-20 10:33:39.000000000 -0400
@@ -693,6 +693,7 @@ static int iwl_set_tkip_dynamic_key_info
 	spin_lock_irqsave(&priv->sta_lock, flags);
 
 	priv->stations[sta_id].keyinfo.alg = keyconf->alg;
+	priv->stations[sta_id].keyinfo.conf = keyconf;
 	priv->stations[sta_id].keyinfo.keylen = 16;
 
 	if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)