From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DATE_IN_PAST_96_XX, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 178BAC433DB for ; Wed, 24 Feb 2021 20:14:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B54F264E20 for ; Wed, 24 Feb 2021 20:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235559AbhBXUOG (ORCPT ); Wed, 24 Feb 2021 15:14:06 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:55969 "EHLO wout3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233291AbhBXUKT (ORCPT ); Wed, 24 Feb 2021 15:10:19 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id F0A51A21; Wed, 24 Feb 2021 15:07:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 24 Feb 2021 15:07:48 -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=rNTMQywQ8eBsU kIt/923G49A0zxSdvCTHQAiyZPzbas=; b=DGsSVA2SNt4yetEvI44HoDh5Yy1Hn +4Qs0ty8N126PQdwoGgvSkuMfwR/WOgZzS6n3PCw8XL7jh6iRPgKTR30SuMBBM3j RIxntvmL7GYz6J3bHUktwoQpzb5FaY/+6AjbPyoNeU7gnZQ7DrOffoq1hJrtcDRh EbZFKLDqxnhNPSwivnSpvUECF5fb2OJpiKaVWLnmmB+lZ4TjRYGof3dgQ97zVaCn iU7wa6vNFzkKW7D+mcS4RqMfRsiH80lyisnLNqv2UuXQwviAfx09jET1opS/hghb FESfjfzGhTBDtVLNRGBzdPRruFdIcwLb2a5Jhdt0oLH0i1mJQR7+6NqeA== 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=rNTMQywQ8eBsUkIt/923G49A0zxSdvCTHQAiyZPzbas=; b=sO53xAH+ UY3dpAnHLXX1EWLzX+Vb49J8DCqVGgwdZr0cHqa9uEw7tJzWs4Ai3bx6YfvLTrPw +g3vBRhDfi/kuT6vQAU1nzIIiL0lSwqezX7tQyTryhE+LNqzOItx6kEHzFACzncP EiBITI/3Jw4wsQhstWtEtnVlc3fgRruDGEWu5YRDcZzfuxSd8+A24ksfHrCJG2qT ngJyteP8ZMYzEF31oWe1vl7GnSI0Ux+0rxlRqqiGgpkMfaLTPLmdBVu3Epw9K14e WFww9DjIVDlCyW1kGghK7pGzDgZ88huV7u+O0j+1FsFIeyPxsQIHpAoiHjlReKKk nOTnf94kb9exeA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeejgddufeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeghihhllhhi rghmucffuhhrrghnugcuoeifihhllhdoghhithesughrnhgurdhmvgeqnecuggftrfgrth htvghrnhepjedvgeffieeivdefleekvddvudffvefhiefgueeujedvgfegfeelkeduffel ffefnecukfhppedvudejrddvfeekrddvtdekrdejgeenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeifihhllhdoghhithesughrnhgurdhmvg X-ME-Proxy: Received: from vagrant.vm (pd9eed04a.dip0.t-ipconnect.de [217.238.208.74]) by mail.messagingengine.com (Postfix) with ESMTPA id 1ED8D1080054; Wed, 24 Feb 2021 15:07:47 -0500 (EST) From: William Durand To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/13] staging: rtl8192e: rename bdHTInfoLen to bd_ht_info_len in bss_ht struct Date: Sat, 20 Feb 2021 17:29:02 +0000 Message-Id: <20210220172909.15812-7-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 bdHTInfoLen to bd_ht_info_len to silence a checkpatch warning about CamelCase. Signed-off-by: William Durand --- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++----- drivers/staging/rtl8192e/rtllib_rx.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 29650e55361a..1f1bca10753d 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -184,7 +184,7 @@ struct bss_ht { u8 bd_ht_cap_buf[32]; u16 bd_ht_cap_len; u8 bd_ht_info_buf[32]; - u16 bdHTInfoLen; + u16 bd_ht_info_len; enum ht_spec_ver bdHTSpecVer; enum ht_channel_width bdBandWidth; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 93fd73a7203b..1fd912d1cbe2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -693,7 +693,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf)); pBssHT->bd_ht_cap_len = 0; memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf)); - pBssHT->bdHTInfoLen = 0; + pBssHT->bd_ht_info_len = 0; pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE; @@ -722,12 +722,12 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, pNetwork->bssht.bd_ht_cap_buf, pNetwork->bssht.bd_ht_cap_len); - if (pNetwork->bssht.bdHTInfoLen > 0 && - pNetwork->bssht.bdHTInfoLen <= + if (pNetwork->bssht.bd_ht_info_len > 0 && + pNetwork->bssht.bd_ht_info_len <= sizeof(pHTInfo->PeerHTInfoBuf)) memcpy(pHTInfo->PeerHTInfoBuf, pNetwork->bssht.bd_ht_info_buf, - pNetwork->bssht.bdHTInfoLen); + pNetwork->bssht.bd_ht_info_len); if (pHTInfo->bRegRT2RTAggregation) { pHTInfo->bCurrentRT2RTAggregation = @@ -786,7 +786,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee, (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf; if (pHTInfo->bCurrentHTSupport) { - if (pNetwork->bssht.bdHTInfoLen != 0) + if (pNetwork->bssht.bd_ht_info_len != 0) pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode; } } diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 5facd55839f5..8c7b0e21de95 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1878,11 +1878,11 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, MAX_IE_LEN); if (*tmp_htinfo_len != 0) { network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; - network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len, - sizeof(network->bssht.bd_ht_info_buf)); + network->bssht.bd_ht_info_len = min_t(u16, *tmp_htinfo_len, + sizeof(network->bssht.bd_ht_info_buf)); memcpy(network->bssht.bd_ht_info_buf, info_element->data, - network->bssht.bdHTInfoLen); + network->bssht.bd_ht_info_len); } } } @@ -2235,13 +2235,13 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, MAX_IE_LEN); if (tmp_htinfo_len) { network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE; - network->bssht.bdHTInfoLen = tmp_htinfo_len > + network->bssht.bd_ht_info_len = tmp_htinfo_len > sizeof(network->bssht.bd_ht_info_buf) ? sizeof(network->bssht.bd_ht_info_buf) : tmp_htinfo_len; memcpy(network->bssht.bd_ht_info_buf, info_element->data, - network->bssht.bdHTInfoLen); + network->bssht.bd_ht_info_len); } break; @@ -2463,9 +2463,9 @@ static inline void update_network(struct rtllib_device *ieee, dst->bssht.bd_ht_cap_len = src->bssht.bd_ht_cap_len; memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_len); - dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen; + dst->bssht.bd_ht_info_len = src->bssht.bd_ht_info_len; memcpy(dst->bssht.bd_ht_info_buf, src->bssht.bd_ht_info_buf, - src->bssht.bdHTInfoLen); + src->bssht.bd_ht_info_len); dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer; dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime; dst->broadcom_cap_exist = src->broadcom_cap_exist; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 2d6d629685f4..f9a51f3620d2 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2242,7 +2242,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb, network->bssht.bd_ht_cap_len); memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bd_ht_info_buf, - network->bssht.bdHTInfoLen); + network->bssht.bd_ht_info_len); if (ieee->handle_assoc_response != NULL) ieee->handle_assoc_response(ieee->dev, (struct rtllib_assoc_response_frame *)header, -- 2.30.0