forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-06-24 15:03:43 +02:00 • committed by Greg Kroah-Hartman
commit e1343f9080
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View file

@ -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