From 6effe68e8fbc506b186f8d4fad8288f935669a29 Mon Sep 17 00:00:00 2001
From: Andrey Yurovsky <andrey@cozybit.com>
Date: Wed, 17 Jun 2009 18:45:34 -0700
Subject: [PATCH] --- yaml --- r: 158897 b: refs/heads/master c:
 ce8d096dac70e92a506d2f686ae4f724f42052cf h: refs/heads/master i:   158895:
 11f65e503c6f93015d216494034b86e696d6264e v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/libertas/assoc.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13740694345b..e3c0bbfb9c92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9834c079d130217c8c5ac8791428ebeb8c660538
+refs/heads/master: ce8d096dac70e92a506d2f686ae4f724f42052cf
diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c
index b9b374119033..fbf26499c9a9 100644
--- a/trunk/drivers/net/wireless/libertas/assoc.c
+++ b/trunk/drivers/net/wireless/libertas/assoc.c
@@ -1368,11 +1368,17 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv,
 	if (ret)
 		goto out;
 
+	memcpy(&priv->wpa_unicast_key, &assoc_req->wpa_unicast_key,
+			sizeof(struct enc_key));
+
 	if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
 		clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
 
 		ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
 		assoc_req->flags = flags;
+
+		memcpy(&priv->wpa_mcast_key, &assoc_req->wpa_mcast_key,
+				sizeof(struct enc_key));
 	}
 
 out: