[PATCH 06/11] staging: wilc1000: rename strHostIFpmkidAttr of union host_if_key_attr

[Tony Cho]

This patch renames strHostIFpmkidAttr of union host_if_key_attr to
pmkid to avoid CamelCase naming convention.

Signed-off-by: Tony Cho <tony....@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index b8899d7..31c6644 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -127,7 +127,7 @@ struct host_if_wep_attr {
 union host_if_key_attr {
        struct host_if_wep_attr wep;
        struct host_if_wpa_attr wpa;
-       struct host_if_pmkid_attr strHostIFpmkidAttr;
+       struct host_if_pmkid_attr pmkid;
 };
 
 /*!
@@ -2650,24 +2650,24 @@ _WPAPtk_end_case_:
 
                PRINT_D(HOSTINF_DBG, "Handling PMKSA key\n");
 
-               pu8keybuf = 
kmalloc((pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * 
PMKSA_KEY_LEN) + 1, GFP_KERNEL);
+               pu8keybuf = 
kmalloc((pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.numpmkid * PMKSA_KEY_LEN) + 
1, GFP_KERNEL);
                if (pu8keybuf == NULL) {
                        PRINT_ER("No buffer to send PMKSA Key\n");
                        return -1;
                }
 
-               pu8keybuf[0] = 
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid;
+               pu8keybuf[0] = 
pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.numpmkid;
 
-               for (i = 0; i < 
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid; i++) {
+               for (i = 0; i < 
pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.numpmkid; i++) {
 
-                       memcpy(pu8keybuf + ((PMKSA_KEY_LEN * i) + 1), 
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid, 
ETH_ALEN);
-                       memcpy(pu8keybuf + ((PMKSA_KEY_LEN * i) + ETH_ALEN + 
1), pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, 
PMKID_LEN);
+                       memcpy(pu8keybuf + ((PMKSA_KEY_LEN * i) + 1), 
pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.pmkidlist[i].bssid, ETH_ALEN);
+                       memcpy(pu8keybuf + ((PMKSA_KEY_LEN * i) + ETH_ALEN + 
1), pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.pmkidlist[i].pmkid, PMKID_LEN);
                }
 
                strWID.id = (u16)WID_PMKID_INFO;
                strWID.type = WID_STR;
                strWID.val = (s8 *)pu8keybuf;
-               strWID.size = 
(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * 
PMKSA_KEY_LEN) + 1;
+               strWID.size = 
(pstrHostIFkeyAttr->uniHostIFkeyAttr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1;
 
                s32Error = send_config_pkt(SET_CFG, &strWID, 1,
                                           get_id_from_handler(hif_drv));
@@ -4525,10 +4525,10 @@ s32 host_int_set_pmkid_info(struct host_if_drv 
*hif_drv, struct host_if_pmkid_at
 
        for (i = 0; i < pu8PmkidInfoArray->numpmkid; i++) {
 
-               
memcpy(msg.body.key_info.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid,
 &pu8PmkidInfoArray->pmkidlist[i].bssid,
+               
memcpy(msg.body.key_info.uniHostIFkeyAttr.pmkid.pmkidlist[i].bssid, 
&pu8PmkidInfoArray->pmkidlist[i].bssid,
                            ETH_ALEN);
 
-               
memcpy(msg.body.key_info.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid,
 &pu8PmkidInfoArray->pmkidlist[i].pmkid,
+               
memcpy(msg.body.key_info.uniHostIFkeyAttr.pmkid.pmkidlist[i].pmkid, 
&pu8PmkidInfoArray->pmkidlist[i].pmkid,
                            PMKID_LEN);
        }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html