From patchwork Wed Jan 15 12:12:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 11334141 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6A41B138D for ; Wed, 15 Jan 2020 12:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DD25207FF for ; Wed, 15 Jan 2020 12:19:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="NRkxrzOe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730497AbgAOMMb (ORCPT ); Wed, 15 Jan 2020 07:12:31 -0500 Received: from mail-bn7nam10on2050.outbound.protection.outlook.com ([40.107.92.50]:24527 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730407AbgAOMMa (ORCPT ); Wed, 15 Jan 2020 07:12:30 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XDv21aBzTsS7RsYVVHxWWwhk5WXM8toij2/+boZBZ6kBo2BibeDxqvwFdmsTgXEQat52ibSiSvaA7+BiSwtKAn4CM4Mimmz9O1nmPVJ0YeWbe+fmN42vyDfdkGuDMOMPhmNRRvS2OeDSUMtr2wzrH9WyICzvuBhDMMTNijN2EXkNl/fns++zkEDGSXFtwZl31npvCb/411agw6eAO569pjmcSniBoGbU1yq+hV717muxKxl8akafhS1XqmXB5ptXh43/MiqE5BaeingmItglhMp9SRysZ/ZvUHpMYoyaaD0bagaYkmYRDq9PC3Nyh6z5J4wYYZr/0cyawv010t4Psg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhQww9H4Ug/YZqWy3+tCxx6M/uj8urd6WRAAOKOSgfk=; b=BGHr8emZ1LheOjJufVIsWb/LjhnPUAg4R1SoQ7CNo0zg4MQeiSnFEsZ2OhbFVUqV9VjiNBFmWGkOXJe6dgVJu7CQAo0Nq+XkbfnAU0V3WeLHAk3V1bInqvir8pLIRvQW4bTaAHgZrBEecQGMOASSzPYnAoLFnrRMuKf9jY5zzOliPLdAMpPinKCMJrs4osgCV1t6MH58Ph9ivR8gmyQamTkNSC7yp79v3qtwhHXfEpDl6CdaqjsEr19yAcNiAYaT/I0lcgYMkNCXs4wkS3nNXthbuyr+2o2j5E3cXnEcNHd4Sbo1hO3cv6xaxM6M001gfsByZF3+p3aZb4lQoIO22A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhQww9H4Ug/YZqWy3+tCxx6M/uj8urd6WRAAOKOSgfk=; b=NRkxrzOet4nAik84m5bqP/19zGskwiXV7U4YOZ1YxkF4NNkY5m395YnZVHoVFHLlHq4/yVKkPugk4XTu2sQydAQEJoVetIc2+urzEyj4FbNCSgSNJqAHDQX6GZeIwClSCRCbEm2uM4qspY/BXeOFDFEl3Swda7fQWRGBvOeUzoo= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4096.namprd11.prod.outlook.com (20.179.150.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Wed, 15 Jan 2020 12:12:23 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf%4]) with mapi id 15.20.2623.018; Wed, 15 Jan 2020 12:12:23 +0000 Received: from pc-42.silabs.com (37.71.187.125) by PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Wed, 15 Jan 2020 12:12:22 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= To: "devel@driverdev.osuosl.org" , "linux-wireless@vger.kernel.org" CC: "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 11/65] staging: wfx: retrieve ampdu_density from sta->ht_cap Thread-Topic: [PATCH 11/65] staging: wfx: retrieve ampdu_density from sta->ht_cap Thread-Index: AQHVy50LtkZjjwN3TU6ocwOSVEE0eg== Date: Wed, 15 Jan 2020 12:12:23 +0000 Message-ID: <20200115121041.10863-12-Jerome.Pouiller@silabs.com> References: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.25.0 x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b3701e95-c478-4a29-46af-08d799b42d72 x-ms-traffictypediagnostic: MN2PR11MB4096: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:222; x-forefront-prvs: 02830F0362 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(346002)(39860400002)(366004)(376002)(136003)(199004)(189003)(85202003)(66946007)(66446008)(66476007)(2906002)(107886003)(66556008)(1076003)(64756008)(5660300002)(8936002)(6486002)(186003)(26005)(8676002)(316002)(81156014)(36756003)(52116002)(2616005)(7696005)(478600001)(16526019)(956004)(54906003)(110136005)(86362001)(71200400001)(85182001)(4326008)(81166006);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB4096;H:MN2PR11MB4063.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZVfgNNtPSMmdc6AKVptoSGZjdKYmJGCgP8ABezRxQcFWTJjkbC4y7ql+Bh5fkj2PQcv4ICMU8Djr5189GSFXCK/iU9/QbSSlUMzrqSYS81sajCMmC1nTDiyatrAccP+LSnSu2p+SgTxYLsckPUtowjFD8KvwXVrsMk51XcDodSFoi9icObTX+xMYT9NCOLq6NXR7a/DoWc2NqaM6dqGVpFQzwpCYfuz3YTlYiaq/MCvFnyOXBcSykHDKrDalOTb6se9x4756+DyB+AbAWgHtpOucpcLRNNkq6nupS/YTxTQbENlZSaIwjik51LYDO3JacUMoKOJk/0SX7HX1dkrIGzr3f/hBMW2kyihTSxDVHCeJg9bx4MrALRyN98J9/gmFiPY4IsfWputXvg8OMaXUC95MhOD84Eqson1zspZ2IxYWAesBWqRkHIz7x8faFboU Content-ID: <2D6BD7011FB07D4E986E06A336CDE004@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3701e95-c478-4a29-46af-08d799b42d72 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 12:12:23.3750 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ro7gklOEQlLb502GJT4SME24Gr2yM1xji8Ihhc1ojV3wFo2+CIkhDqVOQH2vPXqJn/F6pFx+m9wGgbRU2Q4q0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4096 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller wvif->ht_info.ht_cap is a useless copy of sta->ht_cap. It makes no sense to rely on it. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 660a75024f4b..f13a5b41735c 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -825,13 +825,6 @@ static int wfx_ht_greenfield(const struct wfx_ht_info *ht_info) IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); } -static int wfx_ht_ampdu_density(const struct wfx_ht_info *ht_info) -{ - if (!wfx_is_ht(ht_info)) - return 0; - return ht_info->ht_cap.ampdu_density; -} - static void wfx_join_finalize(struct wfx_vif *wvif, struct ieee80211_bss_conf *info) { @@ -870,7 +863,8 @@ static void wfx_join_finalize(struct wfx_vif *wvif, association_mode.short_preamble = info->use_short_preamble; association_mode.basic_rate_set = cpu_to_le32(wfx_rate_mask_to_hw(wvif->wdev, info->basic_rates)); association_mode.greenfield = wfx_ht_greenfield(&wvif->ht_info); - association_mode.mpdu_start_spacing = wfx_ht_ampdu_density(&wvif->ht_info); + if (sta && sta->ht_cap.ht_supported) + association_mode.mpdu_start_spacing = sta->ht_cap.ampdu_density; wfx_cqm_bssloss_sm(wvif, 0, 0, 0); cancel_work_sync(&wvif->unjoin_work);