From 248080aa2a31bff5cd4336a15af3c907962be8da Mon Sep 17 00:00:00 2001 From: Leo Kim Date: Tue, 13 Oct 2015 19:49:31 +0900 Subject: [PATCH] staging: wilc1000: rename pu8macaddr of struct host_if_wpa_attr This patch renames pu8macaddr of struct host_if_wpa_attr to mac_addr to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 18a27230bf66..29bd5bfe4860 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -67,7 +67,7 @@ struct cfg_param_attr { struct host_if_wpa_attr { u8 *key; - const u8 *pu8macaddr; + const u8 *mac_addr; u8 *pu8seq; u8 u8seqlen; u8 u8keyidx; @@ -1968,7 +1968,7 @@ _WPARxGtk_end_case_: } - memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.pu8macaddr, 6); + memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6); memcpy(pu8keybuf + 6, &pstrHostIFkeyAttr->attr.wpa.u8keyidx, 1); memcpy(pu8keybuf + 7, &pstrHostIFkeyAttr->attr.wpa.u8Keylen, 1); memcpy(pu8keybuf + 8, pstrHostIFkeyAttr->attr.wpa.key, @@ -2003,7 +2003,7 @@ _WPARxGtk_end_case_: } - memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.pu8macaddr, 6); + memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6); memcpy(pu8keybuf + 6, &pstrHostIFkeyAttr->attr.wpa.u8Keylen, 1); memcpy(pu8keybuf + 7, pstrHostIFkeyAttr->attr.wpa.key, pstrHostIFkeyAttr->attr.wpa.u8Keylen); @@ -3372,7 +3372,7 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk, msg.body.key_info.attr.wpa.u8Keylen = u8KeyLen; msg.body.key_info.attr.wpa.u8Ciphermode = u8Ciphermode; - msg.body.key_info.attr.wpa.pu8macaddr = mac_addr; + msg.body.key_info.attr.wpa.mac_addr = mac_addr; msg.drv = hif_drv; s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); -- 2.20.1