aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2015-10-28 02:59:32 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-28 19:18:29 -0400
commit6ceba0afed057533a6e338c961e3a279c1e7f6f6 (patch)
treed27c918de757e0a388522c98178eb54a7a676309
parentae5e4522d3e969e41a5ae99b51f8df0f3f9c635c (diff)
staging: wilc1000: rename u8MacAddress of struct get_mac_addr
This patch renames u8MacAddress of struct get_mac_addr to mac_addr to avoid CamelCase naming convention. Signed-off-by: Leo Kim <leo.kim@atmel.com> Signed-off-by: Glen Lee <glen.lee@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/host_interface.c4
-rw-r--r--drivers/staging/wilc1000/host_interface.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2d12672e7c18..ab1617fdf05a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -503,7 +503,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *hif_drv,
503 503
504 wid.id = (u16)WID_MAC_ADDR; 504 wid.id = (u16)WID_MAC_ADDR;
505 wid.type = WID_STR; 505 wid.type = WID_STR;
506 wid.val = pstrHostIfGetMacAddress->u8MacAddress; 506 wid.val = pstrHostIfGetMacAddress->mac_addr;
507 wid.size = ETH_ALEN; 507 wid.size = ETH_ALEN;
508 508
509 result = send_config_pkt(GET_CFG, &wid, 1, 509 result = send_config_pkt(GET_CFG, &wid, 1,
@@ -3377,7 +3377,7 @@ s32 host_int_get_MacAddress(struct host_if_drv *hif_drv, u8 *pu8MacAddress)
3377 memset(&msg, 0, sizeof(struct host_if_msg)); 3377 memset(&msg, 0, sizeof(struct host_if_msg));
3378 3378
3379 msg.id = HOST_IF_MSG_GET_MAC_ADDRESS; 3379 msg.id = HOST_IF_MSG_GET_MAC_ADDRESS;
3380 msg.body.get_mac_info.u8MacAddress = pu8MacAddress; 3380 msg.body.get_mac_info.mac_addr = pu8MacAddress;
3381 msg.drv = hif_drv; 3381 msg.drv = hif_drv;
3382 3382
3383 result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); 3383 result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index c2f21a96995a..7fb1551fc904 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -252,7 +252,7 @@ struct set_mac_addr {
252}; 252};
253 253
254struct get_mac_addr { 254struct get_mac_addr {
255 u8 *u8MacAddress; 255 u8 *mac_addr;
256}; 256};
257 257
258struct ba_session_info { 258struct ba_session_info {