Commit 8ce528b9 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename pu8Head of struct beacon_attr

This patch renames pu8Head of struct beacon_attr to head to
avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51c66185
...@@ -134,7 +134,7 @@ struct beacon_attr { ...@@ -134,7 +134,7 @@ struct beacon_attr {
u32 interval; u32 interval;
u32 dtim_period; u32 dtim_period;
u32 head_len; u32 head_len;
u8 *pu8Head; u8 *head;
u32 u32TailLen; u32 u32TailLen;
u8 *pu8Tail; u8 *pu8Tail;
}; };
...@@ -2359,7 +2359,7 @@ static void Handle_AddBeacon(struct host_if_drv *hif_drv, ...@@ -2359,7 +2359,7 @@ static void Handle_AddBeacon(struct host_if_drv *hif_drv,
*pu8CurrByte++ = ((pstrSetBeaconParam->head_len >> 16) & 0xFF); *pu8CurrByte++ = ((pstrSetBeaconParam->head_len >> 16) & 0xFF);
*pu8CurrByte++ = ((pstrSetBeaconParam->head_len >> 24) & 0xFF); *pu8CurrByte++ = ((pstrSetBeaconParam->head_len >> 24) & 0xFF);
memcpy(pu8CurrByte, pstrSetBeaconParam->pu8Head, pstrSetBeaconParam->head_len); memcpy(pu8CurrByte, pstrSetBeaconParam->head, pstrSetBeaconParam->head_len);
pu8CurrByte += pstrSetBeaconParam->head_len; pu8CurrByte += pstrSetBeaconParam->head_len;
*pu8CurrByte++ = (pstrSetBeaconParam->u32TailLen & 0xFF); *pu8CurrByte++ = (pstrSetBeaconParam->u32TailLen & 0xFF);
...@@ -2378,7 +2378,7 @@ static void Handle_AddBeacon(struct host_if_drv *hif_drv, ...@@ -2378,7 +2378,7 @@ static void Handle_AddBeacon(struct host_if_drv *hif_drv,
ERRORHANDLER: ERRORHANDLER:
kfree(strWID.val); kfree(strWID.val);
kfree(pstrSetBeaconParam->pu8Head); kfree(pstrSetBeaconParam->head);
kfree(pstrSetBeaconParam->pu8Tail); kfree(pstrSetBeaconParam->pu8Tail);
} }
...@@ -4644,12 +4644,12 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval, ...@@ -4644,12 +4644,12 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval,
pstrSetBeaconParam->interval = u32Interval; pstrSetBeaconParam->interval = u32Interval;
pstrSetBeaconParam->dtim_period = u32DTIMPeriod; pstrSetBeaconParam->dtim_period = u32DTIMPeriod;
pstrSetBeaconParam->head_len = u32HeadLen; pstrSetBeaconParam->head_len = u32HeadLen;
pstrSetBeaconParam->pu8Head = kmalloc(u32HeadLen, GFP_KERNEL); pstrSetBeaconParam->head = kmalloc(u32HeadLen, GFP_KERNEL);
if (pstrSetBeaconParam->pu8Head == NULL) { if (pstrSetBeaconParam->head == NULL) {
s32Error = -ENOMEM; s32Error = -ENOMEM;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
memcpy(pstrSetBeaconParam->pu8Head, pu8Head, u32HeadLen); memcpy(pstrSetBeaconParam->head, pu8Head, u32HeadLen);
pstrSetBeaconParam->u32TailLen = u32TailLen; pstrSetBeaconParam->u32TailLen = u32TailLen;
if (u32TailLen > 0) { if (u32TailLen > 0) {
...@@ -4669,8 +4669,8 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval, ...@@ -4669,8 +4669,8 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval,
ERRORHANDLER: ERRORHANDLER:
if (s32Error) { if (s32Error) {
if (pstrSetBeaconParam->pu8Head != NULL) if (pstrSetBeaconParam->head != NULL)
kfree(pstrSetBeaconParam->pu8Head); kfree(pstrSetBeaconParam->head);
if (pstrSetBeaconParam->pu8Tail != NULL) if (pstrSetBeaconParam->pu8Tail != NULL)
kfree(pstrSetBeaconParam->pu8Tail); kfree(pstrSetBeaconParam->pu8Tail);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment