From patchwork Tue Jun 25 18:33:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muna Sinada X-Patchwork-Id: 11016313 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-2.web.codeaurora.org (Postfix) with ESMTP id ABABD1580 for ; Tue, 25 Jun 2019 18:33:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D04E284BD for ; Tue, 25 Jun 2019 18:33:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91584284C0; Tue, 25 Jun 2019 18:33:49 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2BE29284BD for ; Tue, 25 Jun 2019 18:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=c4dSYM4uhAW9RibFz31TVzJ5Dt0E3tavVFa+0XaCpmI=; b=gp6rXuwVR9H7RSRSbpxtxzcEra innKGJEUNBt/IIt6Rrjr88RWcjQBhp4go29aFbj3Kc9/JOWvCogUqGQF22wIC4XU30QBe4kjPy3KV NqvDYTrNCfNz5K/RwqVMoYtT/zZ+7aIu9nBdVzkagtKLLsALA+I5j3Qt0v0zEyzCLBZBFC/m/FnoG euuonyp0MOqNUwEd7OfHmtXH2i31kNhJ1WtUy96ys8TtWbn9fzNsBgxnPGfSlafgtYXi6+FjDNLdM sk2+eACXXHH1cABtay1Yizqfp/sjOxlvOS74gij9m4WQfy4KmultC6v8tRGLImcj5tCdjz7OR+Vxl 5viJ2wvA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hfqGK-0002yU-8v; Tue, 25 Jun 2019 18:33:48 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfqGH-0002xM-CM for ath11k@lists.infradead.org; Tue, 25 Jun 2019 18:33:46 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 13453609CD; Tue, 25 Jun 2019 18:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561487625; bh=B1UTGGoqqjtqbSxtqc3xs/VbRnO87QW2oqO08X32MCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuLDRJGLD42oVOjUE4Ms2mpa44wNSZWV0KCf/rsgCbv8CVOskaZ0vu6R/DEnbMCAJ yIjze6fFjRw4pgGq4bYkRY/+TaLSP4iwA2Fxz2R2Ag7BpEqnXKrMkLq7yuUiWAgWzM ozHlXm2rs3AL1u5kT4/vcS8OEdgrGJ0aPdyC0O0M= Received: from msinada-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: msinada@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7CF306085C; Tue, 25 Jun 2019 18:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561487624; bh=B1UTGGoqqjtqbSxtqc3xs/VbRnO87QW2oqO08X32MCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CI3XvBCyxvpPnbI/ruJrz2Ye4cq4hkIrKJf7eFTPwEhHOt9Q9czGAeg/sSMiQXsKO C7hwlYa7eQjMV5aJg8GpybU+HQbLuyYpS7QjQecHuZIsyPIf2IU2vYlI8AzJjpwtsY DhpcrGgshmPW5qduE9fJ7OAe71zE3m/Urmcpie2U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7CF306085C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=msinada@codeaurora.org From: Muna Sinada To: ath11k@lists.infradead.org Subject: [PATCH 2/4] ath11k: changed parameter from u8 * to struct sk_buff * Date: Tue, 25 Jun 2019 11:33:32 -0700 Message-Id: <1561487614-24577-2-git-send-email-msinada@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561487614-24577-1-git-send-email-msinada@codeaurora.org> References: <1561487614-24577-1-git-send-email-msinada@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190625_113345_458735_D33196CD X-CRM114-Status: GOOD ( 11.07 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Muna Sinada MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Changed ath11k_hal_rx_parse_mon_status() to take sk_buff pointer instead of opaque u8 pointer. Removed variables that became unused. Signed-off-by: Muna Sinada --- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 ++-------- drivers/net/wireless/ath/ath11k/hal_rx.c | 6 +++--- drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 41f6d4115e06..02195f506e7a 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -2406,8 +2406,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, trace_ath11k_htt_rxdesc(ar, skb->data, DP_RX_BUFFER_SIZE); } - hal_status = ath11k_hal_rx_parse_mon_status(ab, &ppdu_info, - (u8 *)skb->data); + hal_status = ath11k_hal_rx_parse_mon_status(ab, &ppdu_info, skb); if (ppdu_info.peer_id == HAL_INVALID_PEERID || hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { @@ -3843,8 +3842,6 @@ static inline void ath11k_dp_rx_mon_status_process_tlv(struct ath11k *ar, struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&dp->mon_data; struct hal_rx_mon_ppdu_info *ppdu_info; struct sk_buff *status_skb; - u8 *rx_tlv; - u8 *rx_tlv_start; u32 tlv_status = HAL_TLV_STATUS_BUF_DONE; struct ath11k_pdev_mon_stats *rx_mon_stats; @@ -3857,11 +3854,8 @@ static inline void ath11k_dp_rx_mon_status_process_tlv(struct ath11k *ar, while (!skb_queue_empty(&pmon->rx_status_q)) { status_skb = skb_dequeue(&pmon->rx_status_q); - rx_tlv = status_skb->data; - rx_tlv_start = rx_tlv; - tlv_status = ath11k_hal_rx_parse_mon_status(ar->ab, ppdu_info, - rx_tlv); + status_skb); if (tlv_status == HAL_TLV_STATUS_PPDU_DONE) { rx_mon_stats->status_ppdu_done++; pmon->mon_ppdu_status = DP_PPDU_STATUS_DONE; diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c index 2d2d5cd5ea5f..3f59b8a75c2a 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -1156,13 +1156,13 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, enum hal_rx_mon_status ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, struct hal_rx_mon_ppdu_info *ppdu_info, - u8 *data) + struct sk_buff *skb) { struct hal_tlv_hdr *tlv; enum hal_rx_mon_status hal_status = HAL_RX_MON_STATUS_BUF_DONE; u16 tlv_tag; u16 tlv_len; - u8 *ptr = data; + u8 *ptr = skb->data; do { tlv = (struct hal_tlv_hdr *)ptr; @@ -1183,7 +1183,7 @@ ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, ptr += tlv_len; ptr = PTR_ALIGN(ptr, HAL_TLV_ALIGN); - if ((ptr - data) >= DP_RX_BUFFER_SIZE) + if ((ptr - skb->data) >= DP_RX_BUFFER_SIZE) break; } while (hal_status == HAL_RX_MON_STATUS_PPDU_NOT_DONE); diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.h b/drivers/net/wireless/ath/ath11k/hal_rx.h index bd6b8d2e9d5e..2c9b19194149 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h @@ -336,7 +336,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, enum hal_rx_mon_status ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, struct hal_rx_mon_ppdu_info *ppdu_info, - u8 *data); + struct sk_buff *skb); #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF