From patchwork Mon Dec 16 17:03:48 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: 1210634 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="jeKRsebY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47c7355v5wz9sRM for ; Tue, 17 Dec 2019 04:06:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727224AbfLPRGP (ORCPT ); Mon, 16 Dec 2019 12:06:15 -0500 Received: from mail-dm6nam11on2086.outbound.protection.outlook.com ([40.107.223.86]:11937 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727120AbfLPRGK (ORCPT ); Mon, 16 Dec 2019 12:06:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i4t4ShBxdnQiS16eK1zbSjpJLIi3mGvBWg9vr5NVKrd+NsTXIStFMXKEfwJ0fT188+j2rzL4XAnk3Q/Zgpy6aQaFRs+YY6QCLIq/qvo8da2l4EKDOmAzN7cOOMMvVDPH4z6iSWvChmj8YU/RUxSOMRSt60+U43JTYAX+v/SW8Y7h3jljudeGY3jIdpsoq1sI+c113VedpwsMF9x+mvsFRZovRhEqYLpnyExPmYm1h8jjsFqmPX34g/9QzH+YwAr2ljUF9Q8vm63/HbfU7l0XMx7VUwj04Dfga5BvhEGhpekFVGRFY1WXGXGPgL7NOdEQEBZo907aqisJnF0oJ9gIYA== 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=bUbJBUyUvp+lFkAS8wytBhyV2RlHjfiyOP3PT9YgncQ=; b=Y6vmXmr65Ji6JweutIFJQyzhqEIuDbMueRhgYcfcYMfRTEocyNfuBY30xGXpQ9aII/83rTHvKdQEhRuIYvt0hEDN1nyT4naPMM6FPLJdD0g44Du810V1MmUh0DNVjl1FwPz/gWlD2Lou61iSlG0O8BOzjcfqOmV8DWNOvxrNlVAcdxqAt0+DFsIgM2jZsH+kjdq3ChDAPlKr2+SI9Y+5x1mLpMzRFqlfyIwgK+b0FOxB0HP76ke4wMYx+HL+7vwnLMy3pJjiYODaisVsMmhmSHf7QhX1wWgKHo/YcJRyCJxNQhiW4Usaicj4oiOs7IQC+Ba3HnRmjnvuXCIBAYgpzQ== 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=bUbJBUyUvp+lFkAS8wytBhyV2RlHjfiyOP3PT9YgncQ=; b=jeKRsebYyO2PfGVt5GAFYkE5zvOuulR8V6u4ORqEFzq8VeQko4585qsEbz5JdLkDtb1xe0y/WJJKP2pscFQn4QCHk1pGgWYZpn2zUoBdAqAsnFnqnleFWpa10PcxaGOEfmJ4ci/RWSk2djuqDYD4jyRi/KoSvE292nvnK7DzryI= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4445.namprd11.prod.outlook.com (52.135.37.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Mon, 16 Dec 2019 17:05:56 +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:05:56 +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 28/55] staging: wfx: better naming for hif_mib_set_association_mode->greenfield Thread-Topic: [PATCH 28/55] staging: wfx: better naming for hif_mib_set_association_mode->greenfield Thread-Index: AQHVtDLIOw1QOYejUEi/Lj89DBceTQ== Date: Mon, 16 Dec 2019 17:03:48 +0000 Message-ID: <20191216170302.29543-29-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: 85ef0514-7f84-46c3-5291-08d7824a374b x-ms-traffictypediagnostic: MN2PR11MB4445: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1148; x-forefront-prvs: 02530BD3AA x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39860400002)(366004)(396003)(136003)(189003)(199004)(110136005)(6486002)(107886003)(36756003)(186003)(316002)(66946007)(54906003)(5660300002)(66446008)(66556008)(85182001)(66476007)(76116006)(91956017)(64756008)(2616005)(6506007)(85202003)(2906002)(26005)(71200400001)(6512007)(4326008)(8936002)(81166006)(1076003)(478600001)(86362001)(81156014)(6666004)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4445; H:MN2PR11MB4063.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: 3/jz9FqtouGXtXKZQRguu8JwvJ7INP06dc9H7hy82biy8TZ3oX019GKL7jte9UnN29hZUNSbIua3oEmuw2wopzDYkntP7rRNCvKxvjkNiFPdaBvgpthImfGaQx0UIblZfDbf4XdNoGJ+IfD5pk1gGqWloOiGlYvYEiWITJ2hZLiTW2/2+xKQYwRNXdCyRdQE8q3CFjfZbTtZUDfbZLLpj/eEadfHUZ/s5VVss7IMMbPyvkISI6b/K+cF6KTLfIGfE6+0KtbIICBKkzTLLfO92tpEaoprAeEViX9uM7e6dYGUQlVlm/9RohjczKYZxo9J610uKpV+mfBPTY5WrwjZ7uITj2Epc7ANSuEq21/HVnogO1INSosEwUeRuoCdQbrNio8UvmY8pdDSzFbj+VQB5eDS/0iYP2NtUhkHWmoXnHDAjYNce/oR2f7bHyxoI/xV Content-ID: MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85ef0514-7f84-46c3-5291-08d7824a374b X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2019 17:03:48.2936 (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: Uzdvo1Amcxm3gNkfFE6IOisymglCFZUaZn2yQfdgZeGB+NwpWcowwfY941xfiQNGKYEJR+k5pduVemQ2PqwDNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4445 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Current name "mixed_or_greenfield_type" does not allow to know if "true" means "mixed" of "greenfield". It is possible to use a better name and drop "enum hif_tx_mode". Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_mib.h | 8 ++------ drivers/staging/wfx/sta.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h index 34e4310ad71f..1603b3074bf7 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/staging/wfx/hif_api_mib.h @@ -395,11 +395,6 @@ struct hif_mib_non_erp_protection { u8 reserved2[3]; } __packed; -enum hif_tx_mode { - HIF_TX_MODE_MIXED = 0x0, - HIF_TX_MODE_GREENFIELD = 0x1 -}; - enum hif_tmplt { HIF_TMPLT_PRBREQ = 0x0, HIF_TMPLT_BCN = 0x1, @@ -474,7 +469,8 @@ struct hif_mib_set_association_mode { u8 reserved1:4; u8 short_preamble:1; u8 reserved2:7; - u8 mixed_or_greenfield_type; + u8 greenfield:1; + u8 reserved3:7; u8 mpdu_start_spacing; u32 basic_rate_set; } __packed; diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index e5c933678c47..939c64f108ed 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -996,7 +996,7 @@ static void wfx_join_finalize(struct wfx_vif *wvif, association_mode.spacing = 1; 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.mixed_or_greenfield_type = wfx_ht_greenfield(&wvif->ht_info); + association_mode.greenfield = wfx_ht_greenfield(&wvif->ht_info); association_mode.mpdu_start_spacing = wfx_ht_ampdu_density(&wvif->ht_info); wfx_cqm_bssloss_sm(wvif, 0, 0, 0);