From patchwork Thu Sep 21 21:34:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9964831 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1D9D16056A for ; Thu, 21 Sep 2017 21:34:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C78B28DD3 for ; Thu, 21 Sep 2017 21:34:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 015E72967F; Thu, 21 Sep 2017 21:34:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC67028DD3 for ; Thu, 21 Sep 2017 21:34:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbdIUVer (ORCPT ); Thu, 21 Sep 2017 17:34:47 -0400 Received: from mail-cys01nam02on0044.outbound.protection.outlook.com ([104.47.37.44]:42998 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751728AbdIUVep (ORCPT ); Thu, 21 Sep 2017 17:34:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GVWQVOIXrfkA6VN8P7d20es3jtEOQZH3SNFggwBFq7o=; b=wuFqcDUZkvGokdx0jJ5nbIZPXBVhYTUyf/H2IGLYitjgw7phY7svQjZh3uEaeSxm1wcZfCCP19aZp4kzRBOM9jwmipz6sLWukInHarOX0BCfPlT7YPdwvw/KYBg7EkrzxtSVZktKZwmIfdL6/6Lic7dNcLwXZS7qNrsdlGVaLLc= Received: from dodo-dell.quantenna.com (12.131.200.68) by BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Thu, 21 Sep 2017 21:34:42 +0000 From: igor.mitsyanko.os@quantenna.com To: linux-wireless@vger.kernel.org Cc: sergey.matyukevich.os@quantenna.com, avinashp@quantenna.com, johannes@sipsolutions.net Subject: [PATCH V3 1/9] qtnfmac: convert channel width from bitfiled to simple enum Date: Thu, 21 Sep 2017 14:34:29 -0700 Message-Id: <20170921213437.27457-2-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> References: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR13CA0006.namprd13.prod.outlook.com (10.169.208.16) To BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38910e0b-d542-4096-c853-08d50138933f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0501MB2035; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 3:2n9yQMQktpNL5n0Ec2q+VLM39avHVNCth3ZauS/ZsVI4vCwW8Uo222uIuxXGdjf1kA302rzXWJUFEtObrk3E3THE6IlSBx4Mlqb5yF9hD5MRctrYSg4ooJg5aZeQ1U9yuGd6Oc1i/+Bn0+lxgZVzYnIBu2kUxJS5i54jQAWjslwOgilRgI6fXj7zsJn1dKlCHoklho0BgKqi3ViXTexpr0iqepg/vaMEVM0kOkyHdsM2D7kf0epOJcmSAFaynm1W; 25:oXqQCs8QNDv1dJ5eGDQPhNiqqpnlfS0GGwlpYUflv3j7q+rHxeevLXF9/S575u22rPrDgSBoO9KmKKuYRFsUbNW+OAqpA4tKOV1rBa8mLzGVvTqbNqded0S5fAtGn0UpqUQUPYDyW+s6SaUuQ6gC8i1Tp+3vX4TxiONgd9Wa9KCkou+bOe8ZiB07HxXnRUPfYoBf4F1Oge0LGlDfhQPRHYBRk1eLDUio51MuFdufYayHh1q02z9KbEeFsf5Rv7seLP56Pnu6icQkkI4S24COAmSxB8t1a++yQ7KFaRES6QJfPcdOWGN8UlDudWW1ZPaEpi1o2oz8qwo8CxRCNy6SHw==; 31:eACCu8s/P4xsU49deE4l4HjgsRGoPyuH3eTDwx1xLU0MR2/TlUIASPKz3fVjvIhlEr/aN+0JAqGne+aq3Y8vdEvQHMGm/GH+JwXYEOGTKwW/aYTFyVkGnzEiEG4fkVLBe+t8IEHGF5OuCdETMFw9AUPZ0hUtk8thYZdCgn8qzGehPpP4v7uUV3AfaNfNMvM+8HlXLoyh02znrAUecIAyfkOvzvj2YnJ8RqTh3PIs4OI= X-MS-TrafficTypeDiagnostic: BLUPR0501MB2035: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 20:qwjbTG8VRlaw3xaA1exl4mzD4mQo/BpTm9cQB/F/oLQvwsgnB9RllQnzrefpkpYgdUHaAPHMltSZ8cij+TtJ/wBhU/eRBnplqW2QPAxmGFL3CvZIZ+ncKNtPttCn9VkbPGYgCse3lFRwC8xsw6qEZppKpNQfd2W4zX7XqLh3wvFDVImN3XzSe7vQyMQ+I+NjzonR6tHbAgcGGgWL4sSrBCbyBvO0jGJvXqDCBw1zc7f2wCpSN35Ls1IlAdZ+VDaUu7UIvMCFCFxNCL5ebV1nvbiLb6sidu8c3stlaig5Kf4b96tK3QC2Kuu+JrJUiwl7jZ5PHwO66NX+Q2yVgBT/hOxYon7wHrftGyfqMlaBZLOP+6GXa5//r4BT3F3Q7immpvOGG18UMmUJUeZEhLF3r+G8J7PszZuIts/6kQw06d8UyUMwbS1CIBbxa48cfNR9QAcukFjTcr4LJUovSMBLrXUMJc5rT1lit8q1Q5TEq65tUdtA3DlGQjjgc6NmbuH3ZArHYkt6ULmbwN+8tJ07X1Zp5ctSpRqNMiTMnk15DENQ+dW4TIAsW51NCyADrXCF7Ao9dIbtyK0jrOfIm0P0FCNZrwRs4DrouPauQxsWhUI=; 4:xwso/nl3qsql17d/sOLUO4/fylc0bMK++MvZfzMy7f3oYR7QuabINivp80YrJ1dTGsNNDfYPKesvrnTPHqxNcPKilO99W5pbJhGvQUunasCLP3LnrAaOX1hRQ/NTEXWQBXfaDQ5hLag30OM+i+xhwA5hsnWls7AJCbQWlkFIda5CzR3gcVtRXEd36QyPXwXgjIO/Jb7Ps7WGu0yvDnTF7U1kIdWhL85jjeb8k+o8EEtdBg/ONqD67C5rdintrDYs X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0501MB2035; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0501MB2035; X-Forefront-PRVS: 04371797A5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39830400002)(189002)(199003)(106356001)(2906002)(105586002)(6486002)(6116002)(53416004)(48376002)(9686003)(50226002)(3846002)(1076002)(36756003)(103116003)(2361001)(76176999)(68736007)(189998001)(33646002)(66066001)(2950100002)(6916009)(478600001)(50986999)(50466002)(47776003)(25786009)(2351001)(101416001)(8676002)(86362001)(69596002)(5660300001)(81166006)(81156014)(305945005)(53936002)(16586007)(85782001)(7736002)(16526017)(6666003)(97736004)(8936002)(5003940100001)(316002)(4326008)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB2035; H:dodo-dell.quantenna.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0501MB2035; 23:5oHDojXeX2p/c26bkk9T90hmD+IiIz3Bn9Q0EbP?= =?us-ascii?Q?InQKCPHMFE7fP9Oj96FmT3QpMZkOgEyJho3UMudWUhjfCfELgS/XKhp1BlIT?= =?us-ascii?Q?4X05E5QvLVgawt87b9deTusjlNvvqRs7b0m5lAqgX1rCUdGhIVEEQD0NLEqP?= =?us-ascii?Q?o1WGQWE/l5fSlAcEJSWL+kHojA92mxb8OtNgeuO7KpmKsy1vm9hIIfSfluR/?= =?us-ascii?Q?zk7dXP/KaqZCXDwIlwPu44SCyqMSS6z03l7R5C7U+Gwrkb3hurZnHMKiQ8ao?= =?us-ascii?Q?hYGcGbDfdN95mLSbKxjz0EZbFh8/LotPaRm9NS7EQI4surMaghGoEbT2BdY0?= =?us-ascii?Q?0RWy9cBmv0CtCQV5XxmeN1k08vYJ34Ez0sJSBpG3fI28/y3f4u8/2fp8n4AL?= =?us-ascii?Q?kGscHncgbqW/LQuXkFe5gnRObkfdF/mLla0L7d2rKMwMTcRUC7b53yu4SUVT?= =?us-ascii?Q?vS5RVKV6fOFywx6ejh8Nrz5yhGq7TiXXECe6D/VCatC5PIyxW3Zsq6ypOwuu?= =?us-ascii?Q?ik71Pneaz6a8N2aJaFtS3Y7yUkEGv/MLwITCu6skrfvMSVFFSvucyFa0q9Zh?= =?us-ascii?Q?gmlrLlyv/fuvgS/OlH8Og2gTR2C41AM57K/zyEcdctHOqrSn46hyyUyrprD3?= =?us-ascii?Q?vs9n9zqJOT1RoKZRUef+swErchwCwtyINAq5yGy700uKlr0Or0o4lohAsXzg?= =?us-ascii?Q?G8DKiMYJtB2nl8OR1rsX/d4TywpzuICgootGBzW/9/PN2jyRMkzNxTlG0Z0D?= =?us-ascii?Q?v2/Eqd4iTCIByQhFq4QDFOe3qnRCB4wJPHxVgd9vWrC9bR6xrRUaALj92egY?= =?us-ascii?Q?tPlR2YNqaKw6ypAl0HxMvmtP6TMgvTyfr8Lu63t09XyDFgQ9LxqSZVgn+pxY?= =?us-ascii?Q?JEfGnPdeYls6MYRuJaOJse1nCSL/cwRPzxu3/LnMUkHNWXl5vF7QoG6ioLS6?= =?us-ascii?Q?Ht+FW8OjykpCboWlL1h/7rdU66b5BnqNzDiD00VOrSlbS5dp6wMKY3VJo19j?= =?us-ascii?Q?7TECOJla3YFwnP4X/KpgWhJXX1ywDoZSxxhZqIuQa3YZVctPhGJQJ8jv9NqK?= =?us-ascii?Q?J7NWUBrauGhDWHN8TOE7aY1u/K4Ck4tFSliejBdyLC9JmImUjMHBvu0XGDjh?= =?us-ascii?Q?qKAQqYxMd/EY/gXCM3AsVR7MW3x2qq1QFuMjsbDZzH2vSEONnlKEuQ76QFw7?= =?us-ascii?Q?Gu4d+ASHzW0+zYoqg1YKgtq/uYdodAiiSD77qnJBEsDnrWDjddbTm/9ToHw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 6:qGSpiov25/LLLrVIJmsy0gWaWoQu17Ks+to+OjmZWUA7qCRf2kY2cfwSTmVm24HSiqfGucWv9y/ILhx9N5MMJCumr1kMsL5k/hzv5MxUL5q5PYrdr6Oh9V0bDiF8byrJm520eI8sF+UStWN2ZM7PlxuVk3GZSetpa5j8mBPjNsIw7Bb0MiwHoLPAtfhfswQTIH8u7GTgvQilvJjH/hBVtCcFUNNsIOWZbYA8e4f9YjXVOxseQ+DlcIuJjBTpYE4jYfOzdukGPcRvPVlFXkuHlSGm0CqLZxmRi815QOljYA284XpbX325syWAtQAe+j3Rk45nyu5aBjN4b7gzxxtfRg==; 5:YsRphyF+H1v2JJmsjg0Gp1WI2E5FiJc1ltM0Y+cPo2Bm6ggIXvuIoewRXzGnVtj7icNegagPMYD7JYcMlfOMBBPVf0gNmnrlvmNYmKzgB52AAhqVVeqEmQK8i0f+kOxB6zpYDx65EewD1n4Ucs00Sw==; 24:jsJ215yaaHqZF/S0UI0ylZUJLK4Ozat5koUV5fhSy4dK35yZJvHMj05Ak+r+cKS7RpJAI95yzJc84kG6PH3A8uw2Vf1Fzwyhln6HbTXoT/8=; 7:6MtuqwKA+vEa+ZcwKpH30Fs8KJVv9TzMUFdyTvdchWGFC/Jb3XYpeoFgL7AZYxculMFS9fMlDbFuWNXz1zN+Yk0XuS65StgsEH89pauqksTVoHHMLUu7/rNXVJ4tqQlP69HJSwGlkwUoLKH1BjwiqLl+h8HkYa9L+SPX1VQbbwHl/jnAYKNUHszLcNWSap0MNJEziR13c8WQx2HpA9DvvGw1hJUI8c60qUZnC8I/UPc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2017 21:34:42.6143 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB2035 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Igor Mitsyanko This will allow to use qlink channel width values to specify BW setting corresponding to enum nl80211_chan_width. Current user is converted to apply BIT() macro manually to each individual qlink_channel_width enumeration value. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/qlink.h | 16 ++++++++-------- drivers/net/wireless/quantenna/qtnfmac/qlink_util.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index a8242f6..a69fd470 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -108,14 +108,14 @@ enum qlink_sta_flags { }; enum qlink_channel_width { - QLINK_CHAN_WIDTH_5 = BIT(0), - QLINK_CHAN_WIDTH_10 = BIT(1), - QLINK_CHAN_WIDTH_20_NOHT = BIT(2), - QLINK_CHAN_WIDTH_20 = BIT(3), - QLINK_CHAN_WIDTH_40 = BIT(4), - QLINK_CHAN_WIDTH_80 = BIT(5), - QLINK_CHAN_WIDTH_80P80 = BIT(6), - QLINK_CHAN_WIDTH_160 = BIT(7), + QLINK_CHAN_WIDTH_5 = 0, + QLINK_CHAN_WIDTH_10, + QLINK_CHAN_WIDTH_20_NOHT, + QLINK_CHAN_WIDTH_20, + QLINK_CHAN_WIDTH_40, + QLINK_CHAN_WIDTH_80, + QLINK_CHAN_WIDTH_80P80, + QLINK_CHAN_WIDTH_160, }; /* QLINK Command messages related definitions diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c index cf024c9..369b77d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c @@ -49,28 +49,28 @@ u8 qlink_chan_width_mask_to_nl(u16 qlink_mask) { u8 result = 0; - if (qlink_mask & QLINK_CHAN_WIDTH_5) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_5)) result |= BIT(NL80211_CHAN_WIDTH_5); - if (qlink_mask & QLINK_CHAN_WIDTH_10) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_10)) result |= BIT(NL80211_CHAN_WIDTH_10); - if (qlink_mask & QLINK_CHAN_WIDTH_20_NOHT) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_20_NOHT)) result |= BIT(NL80211_CHAN_WIDTH_20_NOHT); - if (qlink_mask & QLINK_CHAN_WIDTH_20) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_20)) result |= BIT(NL80211_CHAN_WIDTH_20); - if (qlink_mask & QLINK_CHAN_WIDTH_40) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_40)) result |= BIT(NL80211_CHAN_WIDTH_40); - if (qlink_mask & QLINK_CHAN_WIDTH_80) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_80)) result |= BIT(NL80211_CHAN_WIDTH_80); - if (qlink_mask & QLINK_CHAN_WIDTH_80P80) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_80P80)) result |= BIT(NL80211_CHAN_WIDTH_80P80); - if (qlink_mask & QLINK_CHAN_WIDTH_160) + if (qlink_mask & BIT(QLINK_CHAN_WIDTH_160)) result |= BIT(NL80211_CHAN_WIDTH_160); return result;