mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 16:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Store algorithm type in a u32

Browse Source 
This will allow us to switch to using WLAN_CIPHER_SUITE_* later

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-05-21 09:37:31 +02:00
committed by Greg Kroah-Hartman
parent af97d6cd7b
commit 7989bcf3e2
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8723au/include/rtw_cmd.h
View File

@@ -219,7 +219,7 @@ when 802.1x ==> keyid > 2 ==> unicast key
*/
struct setkey_parm {
u8 algorithm; /* encryption algorithm, could be none, wep40, TKIP, CCMP, wep104 */
u32 algorithm; /* encryption algorithm, could be none, wep40, TKIP, CCMP, wep104 */
u8 keyid;
u8 grpkey; /* 1: this is the grpkey for 802.1x. 0: this is the unicast key for 802.1x */
u8 set_tx; /* 1: main tx key for wep. 0: other key. */
@@ -237,8 +237,8 @@ when shared key ==> algorithm/keyid
*/
struct set_stakey_parm {
u8 addr[ETH_ALEN];
u8 algorithm;
u8 id;/* currently for erasing cam entry if algorithm == _NO_PRIVACY_ */
u32 algorithm;
u8 key[16];
};

6
drivers/staging/rtl8723au/include/rtw_security.h
View File

@@ -177,13 +177,13 @@ do {\
case dot11AuthAlgrthm_Open:\
case dot11AuthAlgrthm_Shared:\
case dot11AuthAlgrthm_Auto:\
encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
encry_algo = psecuritypriv->dot11PrivacyAlgrthm;\
break;\
case dot11AuthAlgrthm_8021X:\
if (bmcst)\
encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\
encry_algo = psecuritypriv->dot118021XGrpPrivacy;\
else\
encry_algo = (u8)psta->dot118021XPrivacy;\
encry_algo = psta->dot118021XPrivacy;\
break;\
} \
} while (0)

2
drivers/staging/rtl8723au/include/sta_info.h
View File

@@ -97,7 +97,7 @@ struct sta_info {
u8 hwaddr[ETH_ALEN];
uint ieee8021x_blocked; /* 0: allowed, 1:blocked */
uint dot118021XPrivacy; /* aes, tkip... */
u32 dot118021XPrivacy; /* aes, tkip... */
union Keytype dot11tkiptxmickey;
union Keytype dot11tkiprxmickey;
union Keytype dot118021x_UncstKey;

4
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View File

@@ -457,7 +457,7 @@ static int set_pairwise_key(struct rtw_adapter *padapter, struct sta_info *psta)
init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_);
psetstakey_para->algorithm = (u8) psta->dot118021XPrivacy;
psetstakey_para->algorithm = psta->dot118021XPrivacy;
memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN);
@@ -469,7 +469,7 @@ static int set_pairwise_key(struct rtw_adapter *padapter, struct sta_info *psta)
return res;
}
static int set_group_key(struct rtw_adapter *padapter, u8 *key, u8 alg,
static int set_group_key(struct rtw_adapter *padapter, u8 *key, u32 alg,
u8 keyid)
{
u8 keylen;