From patchwork Tue Dec 17 16:15:04 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: 1211493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Ph0Flskk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47cjt33spGz9sSZ for ; Wed, 18 Dec 2019 03:15:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728841AbfLQQPN (ORCPT ); Tue, 17 Dec 2019 11:15:13 -0500 Received: from mail-bn8nam11on2073.outbound.protection.outlook.com ([40.107.236.73]:39265 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728804AbfLQQPM (ORCPT ); Tue, 17 Dec 2019 11:15:12 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eN0NmthCv6ar63fXVcuPoRhHruL0ZmMF6r2Rbp4xq5l0R1Bw39Mtc+ybjrPI3B1XQerNEJJoUNxScqCZsPvekvZ2YzTFPttelj82bLtDdVA6/rIeQ52+zmByd4AMxTXNHzSs8QdnLpoKxbCyD1EWPAeejxZr8hPwsUURiVydrn0avHiZNj/kt1OGeqvypoq5isCytmc9cVlEl7c/r/VgKOk1g2gBvdU7uVxJnFoqXuQm8jB5fIEO8mCJSvQBZiTUIYONzOfIZOvwl+q4M07D7zTxmJvHNza5vAUK07BGCaIWU1HbnZEDFU0TXiO0Dy+ZigxoD+/SoOG4Y2qbRVbbWw== 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=OAR2CJleKMtf7Fzv+6IfTj9mDulTG22RY2Q0iKygpGM=; b=byiD2ewwFJJVQ/E4ldIqNtCF6B++knBF7dILpqfxZbLPXVDVofdHIdomwLsg5FPNWxget5vgOb7CyII+ixDgse/QQtmscRHuBYZm2RWv/YmY0RZM455oWsd7e1oXXOdhnPzbBuHttiq/p/6c4zvQ58LGyOfGHqlOJwQbaYj5BqXhWvxkr1wtklQhZU8BBOlz57w7+YOmKZTMjrM1S1O849L8yLsZu1UTkz2QzWSuKksiqDa3gd/XQOavmAat3RXJgacpMf/4Zq+CJE46o+OyvquFZ2VloimqqXvlWd6QKQgMUyxLxHGbyIpaLkVgeKqVD9LF/zfGtFm1xZ2SosQZnw== 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=OAR2CJleKMtf7Fzv+6IfTj9mDulTG22RY2Q0iKygpGM=; b=Ph0FlskkdA7PZLslB2a3pSkGWDcBAY8XV/LRzJ1Ud4jfQrcj1/eSry51EYMg76Ki33v1zVhTsMVwF+0bpQa5y85cwqVMmRuZJldhiOs2PsJZRtXp8HiUq0Fa0AkorSltg8neG/ENFU2Msue5Mk0XFcEah2WW60FO4SjnvQEJJb8= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4208.namprd11.prod.outlook.com (52.135.36.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.20; Tue, 17 Dec 2019 16:15:04 +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; Tue, 17 Dec 2019 16:15:04 +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?SsOpcsO0bWUgUG91?= =?utf-8?q?iller?= Subject: [PATCH v2 26/55] staging: wfx: improve API of hif_req_join->infrastructure_bss_mode Thread-Topic: [PATCH v2 26/55] staging: wfx: improve API of hif_req_join->infrastructure_bss_mode Thread-Index: AQHVtPUkg13sfTPhAkmFbUcYXxvbJg== Date: Tue, 17 Dec 2019 16:15:04 +0000 Message-ID: <20191217161318.31402-27-Jerome.Pouiller@silabs.com> References: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0174.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::18) 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.24.0 x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0b6fc2a0-7664-4578-4f94-08d7830c46b9 x-ms-traffictypediagnostic: MN2PR11MB4208: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; x-forefront-prvs: 02543CD7CD x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39850400004)(396003)(366004)(136003)(376002)(346002)(199004)(189003)(5660300002)(316002)(6506007)(85182001)(478600001)(71200400001)(2906002)(36756003)(186003)(26005)(81166006)(54906003)(1076003)(110136005)(4326008)(8676002)(86362001)(6486002)(52116002)(6512007)(64756008)(85202003)(66946007)(66476007)(66446008)(66556008)(8936002)(107886003)(2616005)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4208; 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: Di/P062DZqb/K+9SxmQ8wMbxlTMkeKtjOPStr471xRPrl84B0jjqL/Gczv3SHAx3vNGZ2P1C5MUkNwDZsEzz5uvACwQ05rfGTCZWb8u+yjiYDys5IT3bwHIz2ev6ygJQ1Lr2qtXfH0dV3fAovdPjVOEPuJpOLKiq7dam0fSVcRaq6P0OL+shiE3JySeAlPY8tF8GN01rzGcq+QwVDfpQV77ovQu4DANwP905aJ5yOjzyoULL2H0uzPc+SU/SoUJ3ZZ3MjyKKuzVv8uj/jKLwZcb8hFJADw8VdDbKMJDddNhMTnRxApAhwLi3uS+OVOTRREUC69qKYrirwQseBdP/EQqnsQaMp9uxacRZeqTEJz2TDG2ieQeEfe5ERvcPL7LmXH1oXB6Yd2iuTmsNij7va69K8RiCSP9GzKjTEBpoyfmQaAjiNlUmPJ+6rr/e38+l Content-ID: <5E879E467877804696EFAA130F292F83@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b6fc2a0-7664-4578-4f94-08d7830c46b9 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2019 16:15:04.7109 (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: 986oG1tFXeaUD5e1gUawCzymkhuKJ/sSQdMw8OvVzwNOqSzmAJIn5imouUvepvrHLCby11Q/V+4lR9lqEPh4/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4208 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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,