aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index afd5617dd92b..307ebcb94b18 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -307,7 +307,7 @@ static int assoc_helper_wep_keys(wlan_private *priv,
307 /* Copy WEP keys into adapter wep key fields */ 307 /* Copy WEP keys into adapter wep key fields */
308 for (i = 0; i < 4; i++) { 308 for (i = 0; i < 4; i++) {
309 memcpy(&adapter->wep_keys[i], &assoc_req->wep_keys[i], 309 memcpy(&adapter->wep_keys[i], &assoc_req->wep_keys[i],
310 sizeof(struct WLAN_802_11_KEY)); 310 sizeof(struct enc_key));
311 } 311 }
312 adapter->wep_tx_keyidx = assoc_req->wep_tx_keyidx; 312 adapter->wep_tx_keyidx = assoc_req->wep_tx_keyidx;
313 313
@@ -703,7 +703,7 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)
703 int i; 703 int i;
704 for (i = 0; i < 4; i++) { 704 for (i = 0; i < 4; i++) {
705 memcpy(&assoc_req->wep_keys[i], &adapter->wep_keys[i], 705 memcpy(&assoc_req->wep_keys[i], &adapter->wep_keys[i],
706 sizeof(struct WLAN_802_11_KEY)); 706 sizeof(struct enc_key));
707 } 707 }
708 } 708 }
709 709
@@ -712,12 +712,12 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)
712 712
713 if (!test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) { 713 if (!test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
714 memcpy(&assoc_req->wpa_mcast_key, &adapter->wpa_mcast_key, 714 memcpy(&assoc_req->wpa_mcast_key, &adapter->wpa_mcast_key,
715 sizeof(struct WLAN_802_11_KEY)); 715 sizeof(struct enc_key));
716 } 716 }
717 717
718 if (!test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) { 718 if (!test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
719 memcpy(&assoc_req->wpa_unicast_key, &adapter->wpa_unicast_key, 719 memcpy(&assoc_req->wpa_unicast_key, &adapter->wpa_unicast_key,
720 sizeof(struct WLAN_802_11_KEY)); 720 sizeof(struct enc_key));
721 } 721 }
722 722
723 if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) { 723 if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {