From patchwork Wed Jul 17 05:54:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathishkumar Muruganandam X-Patchwork-Id: 11047177 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 F28FF138B for ; Wed, 17 Jul 2019 05:54:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E128D286D5 for ; Wed, 17 Jul 2019 05:54:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1B462870C; Wed, 17 Jul 2019 05:54:15 +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 7CA86286D5 for ; Wed, 17 Jul 2019 05:54:15 +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=tjMu8can2uv2pQaO9ftQ5WZbBd8gSX/Y6D5IvV3BD8E=; b=Sop 23ng4IYGxREwDUx/ukWZcZkFPKXQHtIfehZFrdkXQtamk2ZYFZ++uLlx9h90qQDUXseWvp0Pa1uCn 7NjKrmMoNT5Gm6jiygJviOS5hP/SeWUoizYL0s2vBlla9E8rFOyMIZGVeBB778WMlQ90nvdr8HF1t uYS/dzQJZiFtMqXy+BOnOWGezFA2WPFLjAX3voRXe3sVmP/Aj5PP/IN8JbMVVoTHwK82yOAwHdq8C ZZ9np6+53hbihZKUg2dQ4VTCamLNeIWsnFZPav3KtyzHQO/Dm6zIKIkI7naF4gHSAvJ4Mxgle6Bko 9myHO4LSGDXagHCnzPSZJ0mrVZ2DQZQ==; 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 1hnctK-0004At-Cv; Wed, 17 Jul 2019 05:54:14 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnctH-00047v-6m for ath11k@lists.infradead.org; Wed, 17 Jul 2019 05:54:12 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E1B4B618EA; Wed, 17 Jul 2019 05:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1563342850; bh=MaKj9obLZciDLhuN9BfNYqiaQuOJCYuC/ydtHrOxMeY=; h=From:To:Cc:Subject:Date:From; b=JJ6GQLAz54AV2QWFtkGc874/4dONOlcxrhLuj6qIh5fOou3MSq0VCm1CzFHUynkY/ 5g6/hxE+80gg2eKhjsjmNnjbUR4CJp45nClm52+pLOkIblsUaB0D5o8X9+oLq0eNUY 4LCXAJnh4esocuSLHuVG/99RN/8K8mdIE7WuGx4A= Received: from murugana-linux.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: murugana@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A2264602A8; Wed, 17 Jul 2019 05:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1563342850; bh=MaKj9obLZciDLhuN9BfNYqiaQuOJCYuC/ydtHrOxMeY=; h=From:To:Cc:Subject:Date:From; b=JJ6GQLAz54AV2QWFtkGc874/4dONOlcxrhLuj6qIh5fOou3MSq0VCm1CzFHUynkY/ 5g6/hxE+80gg2eKhjsjmNnjbUR4CJp45nClm52+pLOkIblsUaB0D5o8X9+oLq0eNUY 4LCXAJnh4esocuSLHuVG/99RN/8K8mdIE7WuGx4A= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A2264602A8 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=murugana@codeaurora.org From: Sathishkumar Muruganandam To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: Fix wrong phy_mode in mgmt_rx_event_params Date: Wed, 17 Jul 2019 11:24:00 +0530 Message-Id: <1563342840-5278-1-git-send-email-murugana@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190716_225411_391422_21738A72 X-CRM114-Status: UNSURE ( 9.75 ) 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: Sathishkumar Muruganandam 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 the wrong phy_mode parsing in mgmt_rx_event_params and removed unused wlan_phymode enum. Signed-off-by: Sathishkumar Muruganandam --- drivers/net/wireless/ath/ath11k/wmi.c | 3 +-- drivers/net/wireless/ath/ath11k/wmi.h | 24 +----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 1d6a36a2323f..6069750f6a81 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -4757,8 +4757,7 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb) goto exit; } - if (rx_ev.phy_mode == WLAN_PHYMODE_11B && - status->band == NL80211_BAND_5GHZ) + if (rx_ev.phy_mode == MODE_11B && status->band == NL80211_BAND_5GHZ) ath11k_dbg(ab, ATH11K_DBG_WMI, "wmi mgmt rx 11b (CCK) on 5GHz\n"); diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h index e7799c2ad1db..933cf3c080b6 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -4089,28 +4089,6 @@ struct wmi_pdev_radar_ev { s32 sidx; } __packed; -enum wlan_phymode { - WLAN_PHYMODE_AUTO = 0, - WLAN_PHYMODE_11A = 1, - WLAN_PHYMODE_11B = 2, - WLAN_PHYMODE_11G = 3, - WLAN_PHYMODE_11NA_HT20 = 4, - WLAN_PHYMODE_11NG_HT20 = 5, - WLAN_PHYMODE_11NA_HT40PLUS = 6, - WLAN_PHYMODE_11NA_HT40MINUS = 7, - WLAN_PHYMODE_11NG_HT40PLUS = 8, - WLAN_PHYMODE_11NG_HT40MINUS = 9, - WLAN_PHYMODE_11NG_HT40 = 10, - WLAN_PHYMODE_11NA_HT40 = 11, - WLAN_PHYMODE_11AC_VHT20 = 12, - WLAN_PHYMODE_11AC_VHT40PLUS = 13, - WLAN_PHYMODE_11AC_VHT40MINUS = 14, - WLAN_PHYMODE_11AC_VHT40 = 15, - WLAN_PHYMODE_11AC_VHT80 = 16, - WLAN_PHYMODE_11AC_VHT160 = 17, - WLAN_PHYMODE_11AC_VHT80_80 = 18, -}; - #define WMI_RX_STATUS_OK 0x00 #define WMI_RX_STATUS_ERR_CRC 0x01 #define WMI_RX_STATUS_ERR_DECRYPT 0x08 @@ -4124,7 +4102,7 @@ struct mgmt_rx_event_params { u32 snr; u8 rssi_ctl[WLAN_MGMT_TXRX_HOST_MAX_ANTENNA]; u32 rate; - enum wlan_phymode phy_mode; + enum wmi_phy_mode phy_mode; u32 buf_len; int status; u32 flags;