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

Commit 909aa60c authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Kalle Valo
Browse files

wcn36xx: Fold indication payload into message header 



Merge the two allocation instead of separately allocating room for the
indication payload.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent ce30c4fe

drivers/net/wireless/ath/wcn36xx/smd.c

+6 −9
Original line number Diff line number Diff line
@@ -2229,14 +2229,8 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) 
	case WCN36XX_HAL_OTA_TX_COMPL_IND:

	case WCN36XX_HAL_MISSED_BEACON_IND:

	case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:

		msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);

		if (!msg_ind)

			goto nomem;

		msg_ind->msg_len = len;

		msg_ind->msg = kmemdup(buf, len, GFP_KERNEL);

		if (!msg_ind->msg) {

			kfree(msg_ind);

nomem:

		msg_ind = kmalloc(sizeof(*msg_ind) + len, GFP_KERNEL);

		if (!msg_ind) {

			/*

			 * FIXME: Do something smarter then just

			 * printing an error.
@@ -2245,6 +2239,10 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) 
				    msg_header->msg_type);

			break;

		}



		msg_ind->msg_len = len;

		memcpy(msg_ind->msg, buf, len);



		mutex_lock(&wcn->hal_ind_mutex);

		list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);

		queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
@@ -2295,7 +2293,6 @@ static void wcn36xx_ind_smd_work(struct work_struct *work) 
			      msg_header->msg_type);

	}

	list_del(wcn->hal_ind_queue.next);

	kfree(hal_ind_msg->msg);

	kfree(hal_ind_msg);

	mutex_unlock(&wcn->hal_ind_mutex);

}

drivers/net/wireless/ath/wcn36xx/smd.h

+1 −1
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ struct wcn36xx_fw_msg_status_rsp { 


struct wcn36xx_hal_ind_msg {

	struct list_head list;

	u8 *msg;

	size_t msg_len;

	u8 msg[];

};



struct wcn36xx;