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: Ying Luo <luoy@marvell.com>
Signed-off-by: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index 50191539bb32..f2865b51d5d8 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -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 {
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index df3a33c530cf..a4a4a19b008a 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -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);