Commit 9d7aba63 authored by Ying Luo's avatar Ying Luo Committed by John W. Linville
Browse files

mwifiex: rename wapi_rxpn to pn 



This array was used for wapi_rxpn only. Now it will be used for
AES_CMAC as well. So make a generic name for it.

Signed-off-by: default avatarYing Luo <luoy@marvell.com>
Signed-off-by: default avatarStone Piao <piaoyun@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e238a11

drivers/net/wireless/mwifiex/ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct mwifiex_debug_info { 
};



#define MWIFIEX_KEY_INDEX_UNICAST	0x40000000

#define WAPI_RXPN_LEN			16

#define PN_LEN				16



struct mwifiex_ds_encrypt_key {

	u32 key_disable;
@@ -222,7 +222,7 @@ struct mwifiex_ds_encrypt_key { 
	u8 key_material[WLAN_MAX_KEY_LEN];

	u8 mac_addr[ETH_ALEN];

	u32 is_wapi_key;

	u8 wapi_rxpn[WAPI_RXPN_LEN];

	u8 pn[PN_LEN];		/* packet number */

};



struct mwifiex_power_cfg {

drivers/net/wireless/mwifiex/sta_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, 
		memcpy(&key_material->key_param_set.key[2],

		       enc_key->key_material, enc_key->key_len);

		memcpy(&key_material->key_param_set.key[2 + enc_key->key_len],

		       enc_key->wapi_rxpn, WAPI_RXPN_LEN);

		       enc_key->pn, PN_LEN);

		key_material->key_param_set.length =

			cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN);