From patchwork Wed Jun 12 10:49:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maharaja Kennadyrajan X-Patchwork-Id: 10989369 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 9F2781395 for ; Wed, 12 Jun 2019 10:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AD2828426 for ; Wed, 12 Jun 2019 10:47:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E65F2894B; Wed, 12 Jun 2019 10:47:56 +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 2F75828426 for ; Wed, 12 Jun 2019 10:47:56 +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=4kgX+6hKl02VZ+ztzIgsO1KQ26wJM9/f1oM8lGd09B4=; b=U5W CLKE37rw11YXMRGYxw/jyv2WbVLiAP0LPORlldXyV60+o+pbVkbFucWojdGuwCeDoQdhGIG3aZVZa Cr7pmdrBpvMZoZIQKt2vVzUyNNC3b06LzuwSwIoRs5mrq7y3gm5GEpVPqp4x8lqYckvX7VMFl+G1W xb+UQFJiYHh4eURgz5Gog4NOhS0C1DiXKyXj192+3pag9Q8uLNaT7/R9xADVDJv1ttVKgHxeZoT+W aMUv72zHEdcMaFqFr7oKiQQLi0yjJ3aYk35GQeUoJfagnf7jU2klQpvS8y2MJ8xYUtc3UkZNIikP2 EflLgCw6RUTmkPMC5+JhOKWRznzCcxA==; 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 1hb0nL-0000BX-Fg; Wed, 12 Jun 2019 10:47:55 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hb0nI-00009V-9l for ath11k@lists.infradead.org; Wed, 12 Jun 2019 10:47:53 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B7B1060237; Wed, 12 Jun 2019 10:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560336471; bh=UokvpzacfgGH0gUTaNtB+TeiDdi68drpIdFBFLODlCM=; h=From:To:Cc:Subject:Date:From; b=EFNS1NwKi/DvPeVCR9B6u5yEYNq7UtCI9UEkWgg+OW8/wabvoOMupdkxyF3tjfMZw UrlziI3N6/MQ6zLpMsR1Y+LyXzWguGp3QOsD4mo6b+j2PNPNat1oaYusAx/sploRWN mUNkFe2leWCOuKy06y7///IT0TVrVzgX51D7c1+A= Received: from che-swdbs-01.qca.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mkenna@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 58C89602F3; Wed, 12 Jun 2019 10:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560336471; bh=UokvpzacfgGH0gUTaNtB+TeiDdi68drpIdFBFLODlCM=; h=From:To:Cc:Subject:Date:From; b=EFNS1NwKi/DvPeVCR9B6u5yEYNq7UtCI9UEkWgg+OW8/wabvoOMupdkxyF3tjfMZw UrlziI3N6/MQ6zLpMsR1Y+LyXzWguGp3QOsD4mo6b+j2PNPNat1oaYusAx/sploRWN mUNkFe2leWCOuKy06y7///IT0TVrVzgX51D7c1+A= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 58C89602F3 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=mkenna@codeaurora.org From: Maharaja Kennadyrajan To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN Date: Wed, 12 Jun 2019 16:19:08 +0530 Message-Id: <1560336554-14420-1-git-send-email-mkenna@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190612_034752_353194_7062CDAA X-CRM114-Status: UNSURE ( 8.37 ) 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: Maharaja Kennadyrajan 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 macro MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN in the ath11k_dp_rx_h_undecap_raw() in dp_rx.c. Signed-off-by: Maharaja Kennadyrajan --- drivers/net/wireless/ath/ath11k/dp_rx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 84e4dd147ff0..d68db3f57200 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -1453,8 +1453,6 @@ static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, ether_addr_copy(ieee80211_get_SA(hdr), sa); } -#define MICHAEL_MIC_LEN 8 - static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu, enum hal_encrypt_type enctype, struct ieee80211_rx_status *status, @@ -1501,7 +1499,7 @@ static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu, if ((status->flag & RX_FLAG_MMIC_STRIPPED) && !ieee80211_has_morefrags(hdr->frame_control) && enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) - skb_trim(msdu, msdu->len - MICHAEL_MIC_LEN); + skb_trim(msdu, msdu->len - IEEE80211_CCMP_MIC_LEN); /* Head */ if (status->flag & RX_FLAG_IV_STRIPPED) {