From patchwork Mon Dec 16 17:03:47 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: 11294685 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 190BB930 for ; Mon, 16 Dec 2019 17:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E131B2072D for ; Mon, 16 Dec 2019 17:04:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="lqRrZ/2A" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727261AbfLPREH (ORCPT ); Mon, 16 Dec 2019 12:04:07 -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 S1727211AbfLPREG (ORCPT ); Mon, 16 Dec 2019 12:04:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XpTFeevrN5ySwWMsCGAuzBBql8IT6ZnEINHpz5kx18vAv2osqq1Rynh5kqTuXpCIeDie4IuxVlOdsiw6rRjLmbbXzsdXf1TCmuhVUMDENpppQ4IM7FyNTMz9TiLDeodvxV59Gu8ZXsPaL8zpGyiVsOpG8v1vAYQhAdvcbObjuNx4BwhdKVVvpYArctS/2SfTA3KMVZiHoVJ95XrLmCgPyBvNCPpQ4b9gDWtmsvG+uGRfsAbyttNxAnikvL9idTUqQ4FZkLWWRLnUmXFtIxNztxpEhgT8r6otBziPycypJNxZIYpli5OJlozgOD5WTguTQFM8js6BJoHXD+vB8VJbUA== 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=PG4JylPEKHbtwI4r/H/xKWYuJKm52EAz/DJjLZ8muGo=; b=K/7jGUZWf7dzUuUbFdoRhi4bdIZ1KjtNegG22VnmtDwQdKufgh6vNMDlnMV3CbIaRM0ZBUL3BTweWmg+6XAWH5kU/p0sxEsMRqa2r/LFWU4v8cSL/NexFzXXXzZWz8nhJ4ripVcLQPdugM3aVtTzFPoHmcDCHRO1yLCS9D7D6UILbWFjtrtdgr+F4KJaYav4u+WDqF7q7m2TWHII/ar+U7c9W6lDCx4uq4ETHDhwK0u3HCFRgRSvu5HbwXm2aqTIX1gHCOC/Pge67xw/NTrW7cCBxf8+VWmoP5Sul/ugwdOJOtJTwUp8DLK7QYiHB+quA87m715PcGQyKta38uTQZw== 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=PG4JylPEKHbtwI4r/H/xKWYuJKm52EAz/DJjLZ8muGo=; b=lqRrZ/2AJGSjkhIW3krpneQEvdjuoGwqs0/2ryy7AdJJQY+QrTg6NFvq+OqcQzU5wM34P23U/rriku4X7Kg/JgXr8hK2AO8+UiQkRaQZsD6browPNbcSM9zvZnKlBUX0ahDdTn/UQHKdLpek+TDDJy0CbHeD+aLmSLF3LA8+fek= 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:54 +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:54 +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 26/55] staging: wfx: improve API of hif_req_join->infrastructure_bss_mode Thread-Topic: [PATCH 26/55] staging: wfx: improve API of hif_req_join->infrastructure_bss_mode Thread-Index: AQHVtDLH08tuX/G5fkWRLIXlp65cuA== Date: Mon, 16 Dec 2019 17:03:47 +0000 Message-ID: <20191216170302.29543-27-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: ceae76b7-e727-4e44-e846-08d78249eeab x-ms-traffictypediagnostic: MN2PR11MB4351: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; 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: FlnQ+UnDqp4qbU2sCkzzuoj63KWEBFlreBonepgAyuYVXQqkfE7FnDCHmlg6SBFU44nYM5je9aTOjJM9xh2DLppTRwd08DeoaHgPWHI11y2pyjrZrcZjkOLco7S4QBJFTIK8CudJbCCLyfm12I/gZvTP4z1rhf3RQJuACIVBrDonMDoIKLjEp8LyiShwaOBEZOY2fc5DyrjryxExJyQgEJD4oGMDVoOD6EOCpgC3r8fm5Vmh3KrL6DPL3bNQtu6X9BwBrEF6ggl1ItwdmNZqNEbVzvat3vSR1Pjdu7LbeWUJGYEvSI6lM6/UPctIZ/jNTV4J9gqMWu/Dga8ZTbhvXPLeauhWxpkMY+xbfl+/w4rXbArcVmj6s8D8ut7Q/qmetIpjfof4glf6jINPYLhU0Nw8HaYKogUoTzY5JAbHPOWdWRSAqKzwnaszekM7Tdu/ Content-ID: <5D5AAB569C52E144BB653DF5A6434DED@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: ceae76b7-e727-4e44-e846-08d78249eeab X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2019 17:03:47.1623 (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: XNCw2JdVbzHiboqYBOQaom6vVAodEpblLsePM4tiWax5lNjzThbuI/NzcsQSpBUaX8Dur1W6jpRE0c9Tj95/GQ== 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 In fact "mode" is a boolean that indicates if IBSS mode is used. This patch fixes the name and uses a more adapted memory representation. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_cmd.h | 8 ++------ drivers/staging/wfx/sta.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index 4ce3bb51cf04..e848bd3073a2 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -377,11 +377,6 @@ struct hif_cnf_edca_queue_params { u32 status; } __packed; -enum hif_ap_mode { - HIF_MODE_IBSS = 0x0, - HIF_MODE_BSS = 0x1 -}; - enum hif_preamble { HIF_PREAMBLE_LONG = 0x0, HIF_PREAMBLE_SHORT = 0x1, @@ -396,7 +391,8 @@ struct hif_join_flags { } __packed; struct hif_req_join { - u8 mode; + u8 infrastructure_bss_mode:1; + u8 reserved1:7; u8 band; u16 channel_number; u8 bssid[ETH_ALEN]; diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index b4bb5b653e64..23ec7a4a926b 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -651,7 +651,7 @@ static void wfx_do_join(struct wfx_vif *wvif) struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf; struct cfg80211_bss *bss = NULL; struct hif_req_join join = { - .mode = conf->ibss_joined ? HIF_MODE_IBSS : HIF_MODE_BSS, + .infrastructure_bss_mode = !conf->ibss_joined, .preamble_type = conf->use_short_preamble ? HIF_PREAMBLE_SHORT : HIF_PREAMBLE_LONG, .probe_for_join = 1, .atim_window = 0,