aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/assoc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index b9b374119033..fbf26499c9a9 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -1368,11 +1368,17 @@ static int assoc_helper_wpa_keys(struct lbs_private *priv,
1368 if (ret) 1368 if (ret)
1369 goto out; 1369 goto out;
1370 1370
1371 memcpy(&priv->wpa_unicast_key, &assoc_req->wpa_unicast_key,
1372 sizeof(struct enc_key));
1373
1371 if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) { 1374 if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
1372 clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags); 1375 clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
1373 1376
1374 ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req); 1377 ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
1375 assoc_req->flags = flags; 1378 assoc_req->flags = flags;
1379
1380 memcpy(&priv->wpa_mcast_key, &assoc_req->wpa_mcast_key,
1381 sizeof(struct enc_key));
1376 } 1382 }
1377 1383
1378out: 1384out: