From patchwork Mon Jun 20 06:19:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9186689 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A96146075E for ; Mon, 20 Jun 2016 06:21:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 912CF206AF for ; Mon, 20 Jun 2016 06:21:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8340B23B24; Mon, 20 Jun 2016 06:21:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09A78206AF for ; Mon, 20 Jun 2016 06:21:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752268AbcFTGTx (ORCPT ); Mon, 20 Jun 2016 02:19:53 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33809 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbcFTGTv (ORCPT ); Mon, 20 Jun 2016 02:19:51 -0400 Received: by mail-pa0-f53.google.com with SMTP id bz2so47754494pad.1 for ; Sun, 19 Jun 2016 23:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Js8T2qJJ1yOZL8JgVDbTu/fe5wnWu0/q+WpG+ttBsX8=; b=Lb8XsKoMB45qTB35hsFqESa+AF8bvbzvUnzRmqBQ1x73UdguA1bvTcnafLaPXfksjC iPs4boI1Cf5ndhflCqXrgExFafqZZdguAC7zbiM6IDxBkCHsePmh1q0kIUfL1tUP6DJM QJXP/AfeOT5tflwiq2Niuw86Zi8KLxA7Titkg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Js8T2qJJ1yOZL8JgVDbTu/fe5wnWu0/q+WpG+ttBsX8=; b=PvdmLm2BaJnKre7qMq0dilsVC4jiUdi+Pqlt5PYe+O/D0sq9KwFG9QdbCQrplb7Pyk 8RJKpRb1bgCybL/FaeWb96MbUJJQKa6MqzImwwbRV9AVpYSGCl5/5Jp0xyivcxAHOnxI zDcnItOt0AYhoAzeNNTe8XjZm5PtEZX2WDvgifUyZKrlyMVJerFWfq2D0TQQCBxCkRS1 rRLbCUxPU/W7YoDAeoB163UxY59dWRoIZZv/nwfMIbO2sT+/ZEOnsmfuZT1m38/kBitL 4YWUsAzwv6PSmA0N0wCe0wPcyr/3sHezEwFMDr6cKfzbKnu4WsLeY3jtbV+v5oAjyWzZ OWtg== X-Gm-Message-State: ALyK8tI5AuwvjC/APnRF0qcrK9BLoQnFn6EeyKiNDo5I1yRKf1RXZGmuzErxxftoSfXb9mkl X-Received: by 10.66.66.234 with SMTP id i10mr20427051pat.114.1466403590892; Sun, 19 Jun 2016 23:19:50 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id o64sm84948683pfb.76.2016.06.19.23.19.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 23:19:50 -0700 (PDT) From: Bjorn Andersson To: Eugene Krasnikov , Kalle Valo Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson Subject: [PATCH 1/6] wcn36xx: Fold indication payload into message header Date: Sun, 19 Jun 2016 23:19:43 -0700 Message-Id: <1466403588-7041-1-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bjorn Andersson Merge the two allocation instead of separately allocating room for the indication payload. Signed-off-by: Bjorn Andersson Signed-off-by: Bjorn Andersson --- drivers/net/wireless/ath/wcn36xx/smd.c | 15 ++++++--------- drivers/net/wireless/ath/wcn36xx/smd.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index e8b630c4f11e..1a9580d72077 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -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 @@ nomem: 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); } diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h index d93e3fd73831..c4375ce1019a 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.h +++ b/drivers/net/wireless/ath/wcn36xx/smd.h @@ -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;