Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp688332pxb; Wed, 24 Feb 2021 12:15:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEetEub+D9sl0zNvCFHcT5ilVFBuunSsSqBh3+5QM4ypq1GZGqFBV+VgpuGN+bIttDieFP X-Received: by 2002:a17:907:98f1:: with SMTP id ke17mr13486836ejc.498.1614197757799; Wed, 24 Feb 2021 12:15:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614197757; cv=none; d=google.com; s=arc-20160816; b=0NZu0hSDrxADhqWhA4TvVVCxAXi8JBoXC0g/qMAFxR+HQiMLgbVClcnr9ujXToVkgW +zCymEqn0dC/fQHiAN427YN73113ixHnH6NZDubYzk2xB9p9v4ICNHjAEkiWP0YCr8cT LQJb86SECL9inb9pne5CZGCmgHcSlACxX9Js7wm0vXs5cTlRIC0F37Y71Zxi3wYAgN7Z VLrXyE2Bp0VYEKrjOJBJd1CnR2OaLTpb3/RtBgvq4CtfAO6UVlDUPVmYiclxAB/aBXyZ RBB6izMsA8aIvAffXC276kSW5gTLLdB0BON4wIcZJg+oCcxMbJLzZ7p/ddfe0aIEf5pF xEXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=SmomyTsGeDnRErCHGLUruTbibZ9175Qa8oq6k747oKU=; b=urJDPEL31u9rRUpSAdBgh2mrM9tu+m838+MKXfl28wfh07RelgMvTRrkJ+443Biztz ATUC38GwvAs4a8pSP2Dtju99Ij9EjvuhBGZOVJh10EfelHWORyJT4YWlauyIfZnJngAM jzERiGChxgIb6khim50NK7AiN9dQuNlGIG8nOliEvT2CSVg3rTLx9ce02EyH+qmA/74G RVsKjQwsrHuoYLVUvU6I4bz6IpDU+zf5j3S6QIpWdLe2JUw9NiadwGD17klsuOPyKY8I 5990jdlie9W3DcOkZkEqIgSWZEKt2FyU09c/MNvDxZyerrCcbu4UrZXrDZbkRHpHi2yM LIdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@drnd.me header.s=fm2 header.b=UsfWgiui; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=G2uHRCN+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lz18si2020487ejb.576.2021.02.24.12.15.28; Wed, 24 Feb 2021 12:15:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@drnd.me header.s=fm2 header.b=UsfWgiui; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=G2uHRCN+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235428AbhBXUNL (ORCPT + 99 others); Wed, 24 Feb 2021 15:13:11 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:50851 "EHLO wout3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235415AbhBXUKR (ORCPT ); Wed, 24 Feb 2021 15:10:17 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 1D5E3A13; Wed, 24 Feb 2021 15:07:51 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 24 Feb 2021 15:07:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=drnd.me; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=SmomyTsGeDnRE rCHGLUruTbibZ9175Qa8oq6k747oKU=; b=UsfWgiuit7Rb60/gnx/8JACMp8EYV eSAJn0NbTwWOwzSNSaK4hvnDj6nMRN8fPV7u8GsWUFE75XHoezgD7yptC5OK6JYh hX1JpJH2pzMgU8ofaNiBxI4FdYfy/FA7tgICgwwTpsduA5Y/b7+eyg17dtD2wyBy eSrezhZw1wzRl+sy5gzXfER1X/oPUivHQ+GiLxLW1q1QXHZveAqeXKQBnLnmNTcm q1pyzY09zGAnu4wXoQl07U4FYBl0Q2GKTD/8ZeAQ6t+wZ4PGmqTglKVg+EG1144L 5K7gDoHDu2e2wU+eL963uWT5yFW5bxJIQeWWWV1vdNb07poxYdBkb32rQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=SmomyTsGeDnRErCHGLUruTbibZ9175Qa8oq6k747oKU=; b=G2uHRCN+ BCZG5S7Eqdapv17JhJqRbK358qgDw42rxMV/K8ExitglfXcasGtfHa1XLVup96OW zH0Tbsvth+UIUjtjSyGlHNWjjtnVJY4CpV4ShX0GfN9hMhQjQxb7D9D+FB/5wQqW ScghzDiGT422twHf4sZLldEsfUYyTk67ecQ3wUIEJsxkTHYp35PPFMYzW3rNAy2e fxdwGVouICOV1V5K4ruEo9IGLnkt6E+8GJHP7Y2hvgb5AETiGX1/OJ+Rhi4fJ5fU Nyn8awFFwCt87HH4fx7gt+/aRRu0+5FN+Ci8N16Lp9/01Z/PC/82yYVtHLCu+VzT dsxjIqysyM8ehQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeejgddufeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeghihhllhhi rghmucffuhhrrghnugcuoeifihhllhdoghhithesughrnhgurdhmvgeqnecuggftrfgrth htvghrnhepjedvgeffieeivdefleekvddvudffvefhiefgueeujedvgfegfeelkeduffel ffefnecukfhppedvudejrddvfeekrddvtdekrdejgeenucevlhhushhtvghrufhiiigvpe einecurfgrrhgrmhepmhgrihhlfhhrohhmpeifihhllhdoghhithesughrnhgurdhmvg X-ME-Proxy: Received: from vagrant.vm (pd9eed04a.dip0.t-ipconnect.de [217.238.208.74]) by mail.messagingengine.com (Postfix) with ESMTPA id 4803C1080059; Wed, 24 Feb 2021 15:07:50 -0500 (EST) From: William Durand To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/13] staging: rtl8192e: rename RT2RT_HT_Mode to rt2rt_ht_mode in bss_ht struct Date: Sat, 20 Feb 2021 17:29:07 +0000 Message-Id: <20210220172909.15812-12-will+git@drnd.me> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210220172909.15812-1-will+git@drnd.me> References: <20210220172909.15812-1-will+git@drnd.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename RT2RT_HT_Mode to rt2rt_ht_mode to silence a checkpatch warning about CamelCase. Signed-off-by: William Durand --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++---- drivers/staging/rtl8192e/rtllib_rx.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 8a3316e0bf5e..e85d9c2cdc96 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -376,7 +376,7 @@ static void _rtl92e_update_beacon(void *data) if (ieee->pHTInfo->bCurrentHTSupport) HT_update_self_and_peer_setting(ieee, net); ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bd_rt2rt_long_slot_time; - ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode; + ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode; _rtl92e_update_cap(dev, net->capability); } diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index a24551af4a27..0b4ff153fdb6 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -191,7 +191,7 @@ struct bss_ht { u8 bd_rt2rt_aggregation; u8 bd_rt2rt_long_slot_time; - u8 RT2RT_HT_Mode; + u8 rt2rt_ht_mode; u8 bdHT1R; }; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 6ceeaf6eb8d1..cc761d965b1d 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -173,9 +173,9 @@ static void HTIOTPeerDetermine(struct rtllib_device *ieee) if (net->bssht.bd_rt2rt_aggregation) { pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK; - if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_92SE) + if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_92SE) pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK_92SE; - if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_SOFTAP) + if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_SOFTAP) pHTInfo->IOTPeer = HT_IOT_PEER_92U_SOFTAP; } else if (net->broadcom_cap_exist) { pHTInfo->IOTPeer = HT_IOT_PEER_BROADCOM; @@ -699,7 +699,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) pBssHT->bd_rt2rt_aggregation = false; pBssHT->bd_rt2rt_long_slot_time = false; - pBssHT->RT2RT_HT_Mode = (enum rt_ht_capability)0; + pBssHT->rt2rt_ht_mode = (enum rt_ht_capability)0; } void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, @@ -734,7 +734,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, pNetwork->bssht.bd_rt2rt_aggregation; pHTInfo->bCurrentRT2RTLongSlotTime = pNetwork->bssht.bd_rt2rt_long_slot_time; - pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.RT2RT_HT_Mode; + pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode; } else { pHTInfo->bCurrentRT2RTAggregation = false; pHTInfo->bCurrentRT2RTLongSlotTime = false; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 036eca477261..af93eee57038 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1908,12 +1908,12 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE)) - network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; + network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_92SE; } } if (ht_realtek_agg_len >= 5) { if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP)) - network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP; + network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_SOFTAP; } if ((info_element->len >= 3 && -- 2.30.0