From patchwork Tue Jun 18 04:32:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthikeyan periyasamy X-Patchwork-Id: 11000875 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 27FA714BB for ; Tue, 18 Jun 2019 04:33:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 159022888A for ; Tue, 18 Jun 2019 04:33:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09BB628A08; Tue, 18 Jun 2019 04:33:09 +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 A23172888A for ; Tue, 18 Jun 2019 04:33:08 +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: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:In-Reply-To: References:List-Owner; bh=A+cgNpaqMvMCRHV0ngQ2G6s/FboV1CYIpw+UuiD/FH4=; b=kcv 3/A+J3BvwHqyrd1xZoqbdCeHctnukmDYxV4Wtc+/5EBLoWMqM6DeObTnZ5dk4YsRD+0tioKre5NEU jF9EfgKyVK4Y1c/JXGQS+ufqmDcV6Zxz+iU6OVJfTct3mu91fXAA2OvTY/l54sEUyNoIZkC44UUOE UYcteK+Yf/tq5y4EcDACmPz3d434er4ugGiEkd10AfCTDCEvM3FuMe3HAQqfbX4Y/sZr7nfQPHbVs UWgs9Ok1nsJvIL7c2bzwz3WTEgJ4mRGuHMI1WWL/Loafbc9L9QTH29PkYYryOnhBknI2o3gdpTfmt IKbOX5X6LmL/tklzoCmDX4V9c/uA9Dw==; 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 1hd5nv-0004T3-91; Tue, 18 Jun 2019 04:33:07 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hd5nt-0004Sl-GD for ath11k@lists.infradead.org; Tue, 18 Jun 2019 04:33:06 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 31D6B6070D; Tue, 18 Jun 2019 04:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560832385; bh=/zae699aBeumOfNKe4Nk/sfoaYTTZmQ1Lde44CQzi9Y=; h=From:To:Cc:Subject:Date:From; b=gb3FJy4dJFFimFaMPicl/w+PlxvQvTbJMJhp2kaUgBrIt8TKUKZyy5fUw/krKtj7Z ckDT0SuTbMPTirTclPZpMSQ2Q3MDOVtmjw9BPxqLOtPeQSgLSHdceAm6GOHKc91bto 6AIsqjJOugZdI6ZlCBM68+OGmAHcyMlaRP+Yfdsc= Received: from CHECSTP284781-LIN.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: periyasa@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E007E604BE; Tue, 18 Jun 2019 04:33:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560832384; bh=/zae699aBeumOfNKe4Nk/sfoaYTTZmQ1Lde44CQzi9Y=; h=From:To:Cc:Subject:Date:From; b=hgn60LIQUHLEi2tlGhIOtxABzQsxNfr7Rf1qlYay+2i/buYYeJlz4f92+vl3WYbe5 Eh0MJ4ICDKzxaXNnU9HM3X+ag7bOeYU0L5N8aKwql7PbqTr4Ui8SmUXejmKv59EEiG YmEir6b9ZwHsXSbaQcFKxtCrC76q3sgyQ0XJGdLU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E007E604BE 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=periyasa@codeaurora.org From: Karthikeyan Periyasamy To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: cleanup in HTC and tx data path Date: Tue, 18 Jun 2019 10:02:48 +0530 Message-Id: <1560832368-17047-1-git-send-email-periyasa@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190617_213305_562394_0D673C58 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. 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: Karthikeyan Periyasamy MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Removed the unnecessary parenthesis in ath11k_dp_tx(). Replaced the Hard code value to the HTC header structure size while reserve the skb. Modify the WARN_ONCE to WARN_ON in ath11k_htc_build_tx_ctrl_skb(). Signed-off-by: Karthikeyan Periyasamy --- drivers/net/wireless/ath/ath11k/dp_tx.c | 5 ++--- drivers/net/wireless/ath/ath11k/htc.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c index 12668a6..84a50eb 100644 --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c @@ -110,12 +110,11 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, ti.encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); ti.meta_data_flags = arvif->tcl_metadata; - if (info->control.hw_key) { + if (info->control.hw_key) ti.encrypt_type = ath11k_dp_tx_get_encrypt_type(info->control.hw_key->cipher); - } else { + else ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; - } ti.addr_search_flags = arvif->hal_addr_search_flags; ti.search_type = arvif->search_type; diff --git a/drivers/net/wireless/ath/ath11k/htc.c b/drivers/net/wireless/ath/ath11k/htc.c index b42d950..27e79bb 100644 --- a/drivers/net/wireless/ath/ath11k/htc.c +++ b/drivers/net/wireless/ath/ath11k/htc.c @@ -44,8 +44,8 @@ static struct sk_buff *ath11k_htc_build_tx_ctrl_skb(void *ab) if (!skb) return NULL; - skb_reserve(skb, 20); - WARN_ONCE((unsigned long)skb->data & 3, "unaligned skb"); + skb_reserve(skb, sizeof(struct ath11k_htc_hdr)); + WARN_ON_ONCE(!IS_ALIGNED((unsigned long)skb->data, 4)); skb_cb = ATH11K_SKB_CB(skb); memset(skb_cb, 0, sizeof(*skb_cb));