From patchwork Mon Dec 16 17:03:45 2019 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: 11294681 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 ED879930 for ; Mon, 16 Dec 2019 17:04:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6ACB206EC for ; Mon, 16 Dec 2019 17:04:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Bk3cpyTF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727193AbfLPRED (ORCPT ); Mon, 16 Dec 2019 12:04:03 -0500 Received: from mail-eopbgr700081.outbound.protection.outlook.com ([40.107.70.81]:14720 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727174AbfLPREC (ORCPT ); Mon, 16 Dec 2019 12:04:02 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ij7mA0QL1koNCKtmjkJAIKZOIDtqmhy3NeZxcI1dJXwQGfiN9B5lvAa51ex92X/N3hjR4j6/vvzLpg0gtMXstI7zpVL1NsvB7mXeDBnr/hn0lKbLHcP6dtLu/Uk77jNzU5gwWDLJ1Um/xN/M6muYG7yh342mzta2EEHCig25nCkzi7yN1wQCrh59z6+10UNRmrg/k9+9ouGo5QOYSfmeQKnkI8xNFXZBgGrmpYEFp84fG1xKjqGPjeqM1iw295E32D6seF3fTOuQmPZfCxtS4mVhv4KjIJ6vmtFzgQBM1xpNq/CGamTWiOgS27rOwosbmPzKe1r/ThVXcD/zYgc/5g== 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=C87gMOFHM1f4Jz18S2Umi6D5PX3tPJ9v63dv6tDdjsQ=; b=AeAt+5fQI+DmdhwNUpdiO2NoX8gUQf8Folc+tw180FGOn1TRbhmV2CRqGgAT5EifaKl04sePA7LZtKFrfrTi6a+j3pQ+NSwMcUhFp5/300dh+eBvepGo1KMhY/Xfm4DlnnPd82VHT2lsR1NPBmJdc3Rc1JHb3S3TpjcZSEBTmq4vypr2+HSB+sWJ0f9m17Sxp6WkS6hmj3ZAP0yE+l2U2ZrBLf7SAC36Iba/NND866/9ONe1vuo4xPGfNW825XKuMnpzZfQXeKgnR2VU3BFrHRKamKavuHir7nrXyhKJ24HnG6QbJRNM2ZSovdInQazZxYSl7aGiR2e5JRzDWyiZPQ== 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=C87gMOFHM1f4Jz18S2Umi6D5PX3tPJ9v63dv6tDdjsQ=; b=Bk3cpyTFwH2HjqNIVoGkvWm/1mCpjEMSBj+I5S2FdG7+gaHVfE+7KPHhVmFZgyxM48qkPkKo0ZGiBQFb4bYZwwWEZeGMjZJTepl37Uoyfcs4jOVXoTFyp/MdnqKrgE23tjFYWW1kKYnpsHduZXAFyhAW4jf9HCiDRGBunSHkEZQ= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4351.namprd11.prod.outlook.com (52.135.39.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.19; Mon, 16 Dec 2019 17:03:53 +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.2538.019; Mon, 16 Dec 2019 17:03:53 +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 23/55] staging: wfx: fix typo in "num_of_ssi_ds" Thread-Topic: [PATCH 23/55] staging: wfx: fix typo in "num_of_ssi_ds" Thread-Index: AQHVtDLHj69DrwgEJki/D6w1Lg2/sQ== Date: Mon, 16 Dec 2019 17:03:45 +0000 Message-ID: <20191216170302.29543-24-Jerome.Pouiller@silabs.com> References: <20191216170302.29543-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20191216170302.29543-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1d60a0a7-9ad5-46c4-78ca-08d78249ede0 x-ms-traffictypediagnostic: MN2PR11MB4351: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2512; x-forefront-prvs: 02530BD3AA x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(366004)(376002)(346002)(396003)(39860400002)(199004)(189003)(66556008)(66446008)(64756008)(66476007)(76116006)(85202003)(91956017)(66946007)(54906003)(107886003)(4326008)(478600001)(110136005)(71200400001)(6512007)(81156014)(8676002)(81166006)(186003)(36756003)(2906002)(85182001)(6666004)(1076003)(316002)(6506007)(5660300002)(86362001)(26005)(2616005)(6486002)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB4351;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: Eu4fQ4Vr8vWni74f03wBsH4+ZsyDjtxh8cDmwdnBVcAASUxE0rcsomkTxObAfcxW0wvfi/7b7qZs9ns91eaH8ElpdWtTVyeSQBeTUsQU7Ymzgsm+YmN4IJPCCx0wGvEDdAnMf1QvNuZLNHcN7CbR7nbFcDLjyYhtJUN2tISlzG9mPpenmZWZjEuwjV88gvWnOMwn8vcnFOLriC2Ekkom21fCCAHOGF1plr1EqSaF2SDivF1hkHztXSbWYNro/QZeQH5AWuZ/RSgl6mcGzs4IIF8NR2BfX+sHG7jUe3nT9VMkJP0RPeI9y25HEGWgJXbpfOe29di75CrQI17Xyq7S5ilI9DtWhhc3NEGDn08Zt8MmeMaeG3+Pv+7872PZCRjVl0LHkhZuucFZASARForBEP51iEoHZJLgfRRISk1ygLQfk6PmaFhAs252FMDDiBkT Content-ID: <3B49AB0E34D75D48B0116003CD4C66B5@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d60a0a7-9ad5-46c4-78ca-08d78249ede0 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2019 17:03:45.7931 (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: 7xU68afp//PiA8+8mYBBlNGHLVUs8NM5ZKAtGW0rNAKffKutOTrBI1kupCv9PaejSqWPuPPGPGD0iXJmL1A+JA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4351 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller The script that has imported API headers has made a mistake in "num_of_ssi_ds". Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_cmd.h | 4 ++-- drivers/staging/wfx/hif_tx.c | 10 +++++----- drivers/staging/wfx/scan.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index c15831de4ff4..90ba6e9b82ea 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -180,7 +180,7 @@ struct hif_req_start_scan { struct hif_auto_scan_param auto_scan_param; u8 num_of_probe_requests; u8 probe_delay; - u8 num_of_ssi_ds; + u8 num_of_ssids; u8 num_of_channels; u32 min_channel_time; u32 max_channel_time; @@ -196,7 +196,7 @@ struct hif_start_scan_req_cstnbssid_body { struct hif_auto_scan_param auto_scan_param; u8 num_of_probe_requests; u8 probe_delay; - u8 num_of_ssi_ds; + u8 num_of_ssids; u8 num_of_channels; u32 min_channel_time; u32 max_channel_time; diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index e8c2bd1efbac..2f74abca2b60 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -227,12 +227,12 @@ int hif_scan(struct wfx_vif *wvif, const struct wfx_scan_params *arg) struct hif_ssid_def *ssids; size_t buf_len = sizeof(struct hif_req_start_scan) + arg->scan_req.num_of_channels * sizeof(u8) + - arg->scan_req.num_of_ssi_ds * sizeof(struct hif_ssid_def); + arg->scan_req.num_of_ssids * sizeof(struct hif_ssid_def); struct hif_req_start_scan *body = wfx_alloc_hif(buf_len, &hif); u8 *ptr = (u8 *) body + sizeof(*body); WARN(arg->scan_req.num_of_channels > HIF_API_MAX_NB_CHANNELS, "invalid params"); - WARN(arg->scan_req.num_of_ssi_ds > 2, "invalid params"); + WARN(arg->scan_req.num_of_ssids > 2, "invalid params"); WARN(arg->scan_req.band > 1, "invalid params"); // FIXME: This API is unnecessary complex, fixing NumOfChannels and @@ -243,11 +243,11 @@ int hif_scan(struct wfx_vif *wvif, const struct wfx_scan_params *arg) cpu_to_le32s(&body->max_channel_time); cpu_to_le32s(&body->tx_power_level); memcpy(ptr, arg->ssids, - arg->scan_req.num_of_ssi_ds * sizeof(struct hif_ssid_def)); + arg->scan_req.num_of_ssids * sizeof(struct hif_ssid_def)); ssids = (struct hif_ssid_def *) ptr; - for (i = 0; i < body->num_of_ssi_ds; ++i) + for (i = 0; i < body->num_of_ssids; ++i) cpu_to_le32s(&ssids[i].ssid_length); - ptr += arg->scan_req.num_of_ssi_ds * sizeof(struct hif_ssid_def); + ptr += arg->scan_req.num_of_ssids * sizeof(struct hif_ssid_def); memcpy(ptr, arg->ch, arg->scan_req.num_of_channels * sizeof(u8)); ptr += arg->scan_req.num_of_channels * sizeof(u8); WARN(buf_len != ptr - (u8 *) body, "allocation size mismatch"); diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 45e78c5722ff..cb7a1fdd0001 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -204,7 +204,7 @@ void wfx_scan_work(struct work_struct *work) scan.scan_req.max_transmit_rate = API_RATE_INDEX_B_1MBPS; scan.scan_req.num_of_probe_requests = (first->flags & IEEE80211_CHAN_NO_IR) ? 0 : 2; - scan.scan_req.num_of_ssi_ds = wvif->scan.n_ssids; + scan.scan_req.num_of_ssids = wvif->scan.n_ssids; scan.ssids = &wvif->scan.ssids[0]; scan.scan_req.num_of_channels = it - wvif->scan.curr; scan.scan_req.probe_delay = 100;