From patchwork Fri Jun 28 16:04:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muna Sinada X-Patchwork-Id: 11022895 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 BEB55112C for ; Fri, 28 Jun 2019 16:04:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE88328812 for ; Fri, 28 Jun 2019 16:04:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1B312886A; Fri, 28 Jun 2019 16:04:38 +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 0A52E28812 for ; Fri, 28 Jun 2019 16:04:37 +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=5lIeXx+ORP8uWGgsi1LtYmWppys8QZGzjj0Xz00Xwd4=; b=I90oqnHDXArq7eed2r6wId6+7w YdXKbFRjuiVlSyuxZf2r5iGbLDlz/ISosxBL7v1LT6gat6j8t3zESu4zLHMXLNQ22lN+HXKXQ7L7I 2j2QOdO2+J0V0nn0iLcNKds/nPb/YM8hHY2deSLLlurQQrud+0f4FeB1tuchLb4J4XyfURlqQFQJx p5BWDVxlb8eqGE+akRSTSQYjYqNdEejEV6TUhVx9hvU2jnR9P5WZD6t6Tf6rr2Ij4C7G0Zrm0QFxk Wq7uncrqafSXlp5ufFZPL/tsai20/KlKivTqhCq3qsmYR2JIw651roihMrC0KVtS0iXnuFGzDz6Vu Vvpw7l6g==; 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 1hgtMa-0007NV-AL; Fri, 28 Jun 2019 16:04:36 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hgtMS-0007Gc-GI for ath11k@lists.infradead.org; Fri, 28 Jun 2019 16:04:29 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3E701607CA; Fri, 28 Jun 2019 16:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561737868; bh=HgipJMKGb1hxRN1BH9s7aW//bVMH2BMNv3Y78D+nAkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AG2O4WkxLL1C1LjQ5XAV4xTc7cIMEs5u1JiNZdmIdMKWTLCkpoqF1xyHiIOlRzy3a PDi+hjgzcYi3RolSWhMGd2X+NNcV/NENQOkc3eqs91hWiGOH9skwc0UbNX+2fI66Qm u6jooG8tiyKH2YxQrf/7SGKDWimLeyX45Ke6JFuQ= 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 9CE5E602BD; Fri, 28 Jun 2019 16:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561737867; bh=HgipJMKGb1hxRN1BH9s7aW//bVMH2BMNv3Y78D+nAkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOYsDLPx3eneWZAWKdJEEK7A/fPGfJDdMxDPGxvJhACqDL0oX/P1CgmFITarWe9wt Ytii9CsKc1WXDLoImd6liobiVdvEjfSfZJ33v2OOAkzC7dzkCga//zucwkg/n0eG71 ropsfyaVl07vn0uRTZYx/UMj3JYutImia6gRuv58= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9CE5E602BD 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 v2 2/4] ath11k: changed parameter from u8 * to struct sk_buff * Date: Fri, 28 Jun 2019 09:04:12 -0700 Message-Id: <1561737854-19003-2-git-send-email-msinada@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561737854-19003-1-git-send-email-msinada@codeaurora.org> References: <1561737854-19003-1-git-send-email-msinada@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190628_090428_578991_AE02229A X-CRM114-Status: GOOD ( 11.51 ) 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 | 8 ++------ drivers/net/wireless/ath/ath11k/hal_rx.c | 6 +++--- drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 9a1c24705a32..df15e446b76f 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -2602,8 +2602,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, if (ath11k_debug_is_pktlog_rx_stats_enabled(ar)) 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) { @@ -4026,7 +4025,6 @@ static 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; u32 tlv_status = HAL_TLV_STATUS_BUF_DONE; struct ath11k_pdev_mon_stats *rx_mon_stats; @@ -4039,10 +4037,8 @@ static 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; - 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 f3c0e3e13dfd..347e485e60c7 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -1158,13 +1158,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; @@ -1185,7 +1185,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