Commit 75bf22c1 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: rename pstrSetBeaconParam in wilc_add_beacon

This patch renames pstrSetBeaconParam to beacon_info to avoid camelcase.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 733d1031
...@@ -4164,7 +4164,7 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period, ...@@ -4164,7 +4164,7 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period,
{ {
int result = 0; int result = 0;
struct host_if_msg msg; struct host_if_msg msg;
struct beacon_attr *pstrSetBeaconParam = &msg.body.beacon_info; struct beacon_attr *beacon_info = &msg.body.beacon_info;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
if (!hif_drv) { if (!hif_drv) {
...@@ -4178,25 +4178,24 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period, ...@@ -4178,25 +4178,24 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period,
msg.id = HOST_IF_MSG_ADD_BEACON; msg.id = HOST_IF_MSG_ADD_BEACON;
msg.vif = vif; msg.vif = vif;
pstrSetBeaconParam->interval = interval; beacon_info->interval = interval;
pstrSetBeaconParam->dtim_period = dtim_period; beacon_info->dtim_period = dtim_period;
pstrSetBeaconParam->head_len = head_len; beacon_info->head_len = head_len;
pstrSetBeaconParam->head = kmemdup(head, head_len, GFP_KERNEL); beacon_info->head = kmemdup(head, head_len, GFP_KERNEL);
if (!pstrSetBeaconParam->head) { if (!beacon_info->head) {
result = -ENOMEM; result = -ENOMEM;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
pstrSetBeaconParam->tail_len = tail_len; beacon_info->tail_len = tail_len;
if (tail_len > 0) { if (tail_len > 0) {
pstrSetBeaconParam->tail = kmemdup(tail, tail_len, beacon_info->tail = kmemdup(tail, tail_len, GFP_KERNEL);
GFP_KERNEL); if (!beacon_info->tail) {
if (!pstrSetBeaconParam->tail) {
result = -ENOMEM; result = -ENOMEM;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
} else { } else {
pstrSetBeaconParam->tail = NULL; beacon_info->tail = NULL;
} }
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
...@@ -4205,9 +4204,9 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period, ...@@ -4205,9 +4204,9 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period,
ERRORHANDLER: ERRORHANDLER:
if (result) { if (result) {
kfree(pstrSetBeaconParam->head); kfree(beacon_info->head);
kfree(pstrSetBeaconParam->tail); kfree(beacon_info->tail);
} }
return result; return result;
......
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