From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Tue, 24 Jun 2014 13:03:43 +0000 (+0200)
Subject: staging: rtl8723au: rtw_cfg80211_set_encryption(): Obtain key from key_params->key
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e1343f90809ab29bd1ec286fef1d9e6fcc59b404;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

staging: rtl8723au: rtw_cfg80211_set_encryption(): Obtain key from key_params->key

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 2e21223b15be..e521c7792c4d 100644
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -868,7 +868,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
 		}
 
 		memcpy(&psecuritypriv->wep_key[wep_key_idx].key,
-		       param->u.crypt.key, key_len);
+		       keyparms->key, key_len);
 
 		psecuritypriv->wep_key[wep_key_idx].keylen = key_len;
 
@@ -910,19 +910,17 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
 						  " == 1\n", __func__);
 
 					memcpy(psta->dot118021x_UncstKey.skey,
-					       param->u.crypt.key,
+					       keyparms->key,
 					       (key_len > 16 ? 16 : key_len));
 
 					if (keyparms->cipher ==
 					    WLAN_CIPHER_SUITE_TKIP) {
 						memcpy(psta->dot11tkiptxmickey.
 						       skey,
-						       &param->u.crypt.key[16],
-						       8);
+						       &keyparms->key[16], 8);
 						memcpy(psta->dot11tkiprxmickey.
 						       skey,
-						       &param->u.crypt.key[24],
-						       8);
+						       &keyparms->key[24], 8);
 
 						padapter->securitypriv.
 							busetkipkey = 0;
@@ -936,18 +934,16 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
 					memcpy(padapter->securitypriv.
 					       dot118021XGrpKey[param->u.crypt.
 								idx].skey,
-					       param->u.crypt.key,
+					       keyparms->key,
 					       (key_len > 16 ? 16 : key_len));
 					memcpy(padapter->securitypriv.
 					       dot118021XGrptxmickey[param->u.
 								     crypt.idx].
-					       skey, &param->u.crypt.key[16],
-					       8);
+					       skey, &keyparms->key[16], 8);
 					memcpy(padapter->securitypriv.
 					       dot118021XGrprxmickey[param->u.
 								     crypt.idx].
-					       skey, &param->u.crypt.key[24],
-					       8);
+					       skey, &keyparms->key[24], 8);
 					padapter->securitypriv.binstallGrpkey =
 						1;
 					DBG_8723A