Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp371327ybv; Fri, 7 Feb 2020 00:49:38 -0800 (PST) X-Google-Smtp-Source: APXvYqyX4Tm00w3apLgB6h0gM6jqXc9rfoqW2wreVZQfmE0utPHzGKfDOcbzf6rS/LMBZxrPXhPf X-Received: by 2002:a05:6830:18f5:: with SMTP id d21mr1817437otf.225.1581065378237; Fri, 07 Feb 2020 00:49:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581065378; cv=none; d=google.com; s=arc-20160816; b=VnE966UyzEpigUT/NBJLtq7VE/ox9inWmCoYwGCI2rQ4OMOD2/K0VCPr5erX+hw0ZM z5bf4NwSfPasc5EGq2AsAawDcT+n+ScoSPVvuaKn97PADRU+nCS1lq/z1ZrkV3PmHv5Z QrZICSQgp8rcCJ8fRMm1BckSUYD7glAzbEZbPO17voHA1Du7rrXqmPKaOESelKYx0K7M r4lZvbwJW47z7fxl1bVH2Yzg6eCA6I9PltInI4qxZ2TBanbqYQ6pmn38HxqVGk/TxRj9 /kkHwjeUMfaMYo6tyD3GYrLjNkovqMAIgXYGjoBYg2cc2wsJOgZE1V1Dz9fipahVsafM WbGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:authenticated-by; bh=SrxTxz3PxW/nmgGljfi78/ScN4uc7tAjP6Sg4WbBDyU=; b=oA8AxkXA9/HQR2BwKEYJTd1eqieTqjxZ+WhmanEUGYUfXJ0B3Sx149FGaBlgbenO2o 4vJfd7/2E8Q9GJkPWbFLoekAKa8FgHUvKfa3em3ujZwoEdkcfRLtviUMXJvFyVLH8HND pdwy8uYZTm3TWBfaRnqDO9+iryXKCwe6LdpWkVp254rrO0iQ+McgE6x0tNg7VtVZJ3ta OKdHCIkLGHMiZEYUrBXuPejCzpNNd9Ky7VFcpVBhMoQtn6x5qDT9EIWoLrG6qPZ9cXRZ 0yKUcHz3A7+a71I0zOMo93J1oagnbD+W0wDo2bdOYiHiVv8PrlnP5dlDBPu4u+p3wpmj oZvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q5si1428655otc.104.2020.02.07.00.49.26; Fri, 07 Feb 2020 00:49:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726954AbgBGIrs (ORCPT + 99 others); Fri, 7 Feb 2020 03:47:48 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:42879 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbgBGIrs (ORCPT ); Fri, 7 Feb 2020 03:47:48 -0500 Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.62 with qID 0178lfct009980, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (RTEXMB06.realtek.com.tw[172.21.6.99]) by rtits2.realtek.com.tw (8.15.2/2.57/5.78) with ESMTPS id 0178lfct009980 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 7 Feb 2020 16:47:41 +0800 Received: from RTEXMB02.realtek.com.tw (172.21.6.95) by RTEXMB06.realtek.com.tw (172.21.6.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Fri, 7 Feb 2020 16:47:41 +0800 Received: from RTEXMB06.realtek.com.tw (172.21.6.99) by RTEXMB02.realtek.com.tw (172.21.6.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Fri, 7 Feb 2020 16:47:41 +0800 Received: from RTITCASV01.realtek.com.tw (172.21.6.18) by RTEXMB06.realtek.com.tw (172.21.6.99) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.1.1779.2 via Frontend Transport; Fri, 7 Feb 2020 16:47:41 +0800 Received: from localhost.localdomain (172.21.68.128) by RTITCASV01.realtek.com.tw (172.21.6.18) with Microsoft SMTP Server id 14.3.468.0; Fri, 7 Feb 2020 16:47:31 +0800 From: To: CC: , Subject: [PATCH v3] rtw88: Fix incorrect beamformee role setting Date: Fri, 7 Feb 2020 16:47:29 +0800 Message-ID: <20200207084729.24882-1-yhchuang@realtek.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.21.68.128] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Tzu-En Huang In associating and configuring beamformee, bfee->role is not correctly set before rtw_chip_ops::config_bfee(). Fix it by setting it correctly. Signed-off-by: Tzu-En Huang Signed-off-by: Yan-Hsuan Chuang --- v1 -> v2 * cannot put bfee->role = RTW_BFEE_NONE after out_unlock put it enclosed by else v2 -> v3 * remove unnecessary 'else' statement drivers/net/wireless/realtek/rtw88/bf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c index fda771d23f71..b6d1d71f4d30 100644 --- a/drivers/net/wireless/realtek/rtw88/bf.c +++ b/drivers/net/wireless/realtek/rtw88/bf.c @@ -41,7 +41,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_sta_vht_cap *ic_vht_cap; const u8 *bssid = bss_conf->bssid; u32 sound_dim; - u8 bfee_role = RTW_BFEE_NONE; u8 i; if (!(chip->band & RTW_BAND_5G)) @@ -67,7 +66,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, } ether_addr_copy(bfee->mac_addr, bssid); - bfee_role = RTW_BFEE_MU; + bfee->role = RTW_BFEE_MU; bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); bfee->aid = bss_conf->aid; bfinfo->bfer_mu_cnt++; @@ -85,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, sound_dim >>= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT; ether_addr_copy(bfee->mac_addr, bssid); - bfee_role = RTW_BFEE_SU; + bfee->role = RTW_BFEE_SU; bfee->sound_dim = (u8)sound_dim; bfee->g_id = 0; bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); @@ -102,7 +101,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, } out_unlock: - bfee->role = bfee_role; rcu_read_unlock(); } -- 2.17.1