Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/wilc1000/host_interface.c

+12 −13
Original line number Diff line number Diff line
@@ -4164,7 +4164,7 @@ int wilc_add_beacon(struct wilc_vif *vif, u32 interval, u32 dtim_period, 
{

	int result = 0;

	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;



	if (!hif_drv) {
@@ -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.vif = vif;

	pstrSetBeaconParam->interval = interval;

	pstrSetBeaconParam->dtim_period = dtim_period;

	pstrSetBeaconParam->head_len = head_len;

	pstrSetBeaconParam->head = kmemdup(head, head_len, GFP_KERNEL);

	if (!pstrSetBeaconParam->head) {

	beacon_info->interval = interval;

	beacon_info->dtim_period = dtim_period;

	beacon_info->head_len = head_len;

	beacon_info->head = kmemdup(head, head_len, GFP_KERNEL);

	if (!beacon_info->head) {

		result = -ENOMEM;

		goto ERRORHANDLER;

	}

	pstrSetBeaconParam->tail_len = tail_len;

	beacon_info->tail_len = tail_len;



	if (tail_len > 0) {

		pstrSetBeaconParam->tail = kmemdup(tail, tail_len,

						   GFP_KERNEL);

		if (!pstrSetBeaconParam->tail) {

		beacon_info->tail = kmemdup(tail, tail_len, GFP_KERNEL);

		if (!beacon_info->tail) {

			result = -ENOMEM;

			goto ERRORHANDLER;

		}

	} else {

		pstrSetBeaconParam->tail = NULL;

		beacon_info->tail = NULL;

	}



	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, 


ERRORHANDLER:

	if (result) {

		kfree(pstrSetBeaconParam->head);

		kfree(beacon_info->head);



		kfree(pstrSetBeaconParam->tail);

		kfree(beacon_info->tail);

	}



	return result;