From nobody Sat Dec 27 01:12:17 2025 Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF92753809 for ; Mon, 25 Dec 2023 20:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="CeoxjKpV" Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-5944d1ce0c7so1304646eaf.0 for ; Mon, 25 Dec 2023 12:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535798; x=1704140598; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xES2C4UFSivAsOy1fJwWjUsPWGiW636trT7pF5WSYQM=; b=CeoxjKpVHzNRN2xoUdlH/4LCOJnANSyC0dHwcN3HzldLlpayGqwmWFfTs37WX/VcUA Z+uSgCNB3J7Rn9cC+R4B0RxNsPph2MIhYgDTi8gpS+RWwMRaR+x8n4RRZ5QxBmYtqVPr Gjitsm+PUl3/El6GUqjBJp3IvAjk5plDXfWi4uVZYcBGILtpTlaODGo048aYYK2an97P lYmwHnEwk7q9rW6cN307GY+v07XhDINJUbVpmmQaSCr4P9hX1AeiNUrHaRRS/8I5An8+ ZZrgumjNIp1ORe+adCczpbwLHineyaqd3ZYhuaebgJCjaVqTzKH4lySGHTugYalqLui1 T4/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535798; x=1704140598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xES2C4UFSivAsOy1fJwWjUsPWGiW636trT7pF5WSYQM=; b=J915lymg/Wlwx+kNOD8hsv+nVCTyHqVOsJxexoidhdQzbbSc+dmtz8qewdN29ldlGY Uyfl2TjB6Q/ZwmzI2lR77GZgcnEX05SYFwoBak/qp/g6pZk4NzZI5gMA8ynedDxCR/TC A4bl5+LU5wWg34uZC1ehUYIf0GB1r7+LPR1wHRxxvkR4q+t6/JXMAJBWkgk/9DHslBw4 n9XH+lKwXkmbAfkztl+ChnqALBreH/y5WOxgJTTdqG00xbcFQzM2CsIZJIO6QfIlKUln THGpnoPmPHFpxfBLNCNo1TZxXmEi55mevroIG/9RXSj6096E/MY8neftpSKPTx3nmzg7 S5lg== X-Gm-Message-State: AOJu0YysytddHOcRokbZRFpIKCmyXRVUzSOwCa8VFgbz1DYJKtILpeSP TO0Ldff6AyiA/+Iv11+3GpGqyW9MAqXhyvbt8huZpPAHeb0= X-Google-Smtp-Source: AGHT+IF7OBbrlT9jJgpkWnHlNkkrsaCVZjchOFcCiovyn3qMojiUguo39t8NDykShONVHQekOzkuxg== X-Received: by 2002:a05:6358:106:b0:174:f1c7:f9f1 with SMTP id f6-20020a056358010600b00174f1c7f9f1mr1367822rwa.37.1703535798602; Mon, 25 Dec 2023 12:23:18 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:17 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 1/6] Staging: rtl8192e: Rename variable bUsed Date: Mon, 25 Dec 2023 12:23:09 -0800 Message-Id: <20231225202314.31869-2-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable bUsed to used to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index d6cd0e0785c4..bace5dabf860 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1164,7 +1164,7 @@ struct rt_pmkid_list { u8 Bssid[ETH_ALEN]; u8 PMKID[16]; u8 SsidBuf[33]; - u8 bUsed; + u8 used; }; =20 /*************** DRIVER STATUS *****/ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index e3d51355dab3..3bff95a93650 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -670,7 +670,7 @@ static inline int SecIsInPMKIDList(struct rtllib_device= *ieee, u8 *bssid) int i =3D 0; =20 do { - if ((ieee->PMKIDList[i].bUsed) && + if ((ieee->PMKIDList[i].used) && (memcmp(ieee->PMKIDList[i].Bssid, bssid, ETH_ALEN) =3D=3D 0)) break; i++; --=20 2.39.2 From nobody Sat Dec 27 01:12:17 2025 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A204B53808 for ; Mon, 25 Dec 2023 20:23:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="a1+OFO2u" Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3bbb78d0eb3so100857b6e.0 for ; Mon, 25 Dec 2023 12:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535799; x=1704140599; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jRNgt5in1rawwI1Ihf7aE8qeFKHIp2oRP3X2LuU5NhE=; b=a1+OFO2uT4b7FwQ7KHXy6yC0gxd/LZH1F+kShUEtw+jzTOnqVSjs/ZIR8B0LKEiKMj JSFUwSPl4HKDHMXCmF07HJJprB/BH3DVIfHTyE1ExVvzqfrfVzy+xavPxwQnoyHvZsPn aJK/0plxrMj0lU4VZXBS5kF7RZRPVEfDYd9btldBSLzgLMorYXIn+xM1WH2qo1Pb1Lve zRcKgcxeruIVZSz0D9ZLfrGmnCn4Zv0r7Uw2aH+cEtyT6ckDJRTHeerd76nzEmWgYDfM kOu9WvhyZ/BzzHrlc0k5feJeKAfbY1RAv0RKuHbTvrpBSOQHsMeFhmqGTLKhmzEzp93V eqng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535799; x=1704140599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jRNgt5in1rawwI1Ihf7aE8qeFKHIp2oRP3X2LuU5NhE=; b=NBg4VFbEBPdiTe72AE5icTnRgWx58UTqgum5pTvxDPgIBResE/bOyRKNH+nCYR0MY5 gNtrk8iKMzju989sr4s9ImMdrVDNq3DNqVFqkyCbaudmHM/1OUGoBLWM4STPfCLf/YSb wrfCaU4Ty+o/ufwO4EUtClx3iQUxharqZdTNny5W9Umyq28XVQP6oGf1wfUbEU2byvyT y65knQbYc0z8BB6kTVD6WoZ/yeAV7MrouA9gPr4SWlI9thz5iVohOrKv76Cv9jtQx+Mk LMvCvf++iKNilYDyZGd3o0ZQRUvpf8woUq7JHb1VAXCe+BcckbNp3J5GAhNsxbBG/xYV qsRg== X-Gm-Message-State: AOJu0YxSxfCOsEpmogRhDphEAeqLVZ59MDBQ95uvP+ZwLuSsDEUS+siH qMfsdPy9NWAK4eHgMhWRvu0C2pNmHgWF7Q== X-Google-Smtp-Source: AGHT+IGRcrm6u0JMPHJWKCUqhE7w8h2cxF1+5nYlprKEs39W2EOhlnY8braepw2LXGqq5M8LEfR9VQ== X-Received: by 2002:a05:6808:1649:b0:3bb:89d2:4e13 with SMTP id az9-20020a056808164900b003bb89d24e13mr6579254oib.25.1703535799745; Mon, 25 Dec 2023 12:23:19 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:19 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 2/6] Staging: rtl8192e: Rename variable NumTxOkInPeriod Date: Mon, 25 Dec 2023 12:23:10 -0800 Message-Id: <20231225202314.31869-3-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable NumTxOkInPeriod to num_tx_ok_in_period to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 5107d06a9fd0..b2c56e2099ce 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -972,11 +972,11 @@ static void _rtl92e_watchdog_wq_cb(void *data) } if ((ieee->link_state =3D=3D MAC80211_LINKED) && (ieee->iw_mode =3D=3D IW= _MODE_INFRA)) { if (ieee->link_detect_info.NumRxOkInPeriod > 100 || - ieee->link_detect_info.NumTxOkInPeriod > 100) + ieee->link_detect_info.num_tx_ok_in_period > 100) bBusyTraffic =3D true; =20 if (ieee->link_detect_info.NumRxOkInPeriod > 4000 || - ieee->link_detect_info.NumTxOkInPeriod > 4000) { + ieee->link_detect_info.num_tx_ok_in_period > 4000) { bHigherBusyTraffic =3D true; if (ieee->link_detect_info.NumRxOkInPeriod > 5000) bHigherBusyRxTraffic =3D true; @@ -985,7 +985,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) } =20 if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + - ieee->link_detect_info.NumTxOkInPeriod) > 8) || + ieee->link_detect_info.num_tx_ok_in_period) > 8) || (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) bEnterPS =3D false; else @@ -1004,7 +1004,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) } =20 ieee->link_detect_info.NumRxOkInPeriod =3D 0; - ieee->link_detect_info.NumTxOkInPeriod =3D 0; + ieee->link_detect_info.num_tx_ok_in_period =3D 0; ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; ieee->link_detect_info.bBusyTraffic =3D bBusyTraffic; =20 @@ -1773,22 +1773,22 @@ static irqreturn_t _rtl92e_irq(int irq, void *netde= v) tasklet_schedule(&priv->irq_rx_tasklet); =20 if (inta & IMR_BKDOK) { - priv->rtllib->link_detect_info.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.num_tx_ok_in_period++; _rtl92e_tx_isr(dev, BK_QUEUE); } =20 if (inta & IMR_BEDOK) { - priv->rtllib->link_detect_info.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.num_tx_ok_in_period++; _rtl92e_tx_isr(dev, BE_QUEUE); } =20 if (inta & IMR_VIDOK) { - priv->rtllib->link_detect_info.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.num_tx_ok_in_period++; _rtl92e_tx_isr(dev, VI_QUEUE); } =20 if (inta & IMR_VODOK) { - priv->rtllib->link_detect_info.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.num_tx_ok_in_period++; _rtl92e_tx_isr(dev, VO_QUEUE); } =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index bace5dabf860..b56a8e1ce474 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1118,7 +1118,7 @@ struct rt_link_detect { u16 SlotNum; u16 SlotIndex; =20 - u32 NumTxOkInPeriod; + u32 num_tx_ok_in_period; u32 NumRxOkInPeriod; u32 NumRxUnicastOkInPeriod; bool bBusyTraffic; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 196eacc7a768..80e4e5b8de89 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1150,7 +1150,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_d= evice *ieee, u8 unicast, if (unicast) { if (ieee->link_state =3D=3D MAC80211_LINKED) { if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + - ieee->link_detect_info.NumTxOkInPeriod) > 8) || + ieee->link_detect_info.num_tx_ok_in_period) > 8) || (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) { ieee->leisure_ps_leave(ieee->dev); } diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 3bff95a93650..b30533f92b53 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2076,7 +2076,7 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_detect_info.SlotNum =3D 2; ieee->link_detect_info.NumRecvBcnInPeriod =3D 0; ieee->link_detect_info.NumRecvDataInPeriod =3D 0; - ieee->link_detect_info.NumTxOkInPeriod =3D 0; + ieee->link_detect_info.num_tx_ok_in_period =3D 0; ieee->link_detect_info.NumRxOkInPeriod =3D 0; ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; ieee->bIsAggregateFrame =3D false; --=20 2.39.2 From nobody Sat Dec 27 01:12:17 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CC845380B for ; Mon, 25 Dec 2023 20:23:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="FPBI4vvD" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-28bc870c540so2995138a91.2 for ; Mon, 25 Dec 2023 12:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535800; x=1704140600; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x0BQwgGlchI9j4vF66gvl0jTFAruxLJpJhtJa5sgnO0=; b=FPBI4vvDVib46QIuUEjoZhl25+FCjr09RSWiFtgIKIpQm3NkGxZOY4aYdX0eMn4Udx BueWADSU9r3PVh8YUKr23za2De8eZLO8/3YMJMh8eXK96EH1b0AnYZfdIrzFkLjmYO30 ZLPZw1UaEPM9woOQt/oCzZS0bz7rvJgpOI0T/iFs2ADeQiWwn2/jWEFCtruSRSqrzZHu Wk0WsHsRKn5zspF444GJeHinBk0cKIkLcrW7dRjLtgwq2BXCxyDXUlsjs1pSqv44D79h 1pPF9YmhxhOjEbT3b0XD9FBBXDbnauLtPcHnolRIsCS7bh/0bfJcIcqaXtya8arabRUp 2JOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535800; x=1704140600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x0BQwgGlchI9j4vF66gvl0jTFAruxLJpJhtJa5sgnO0=; b=GFVK16VfJZVk/554ZhF6RNzdNQsBEjYw6hBGjRL5VFtfAe5eOfe9xM1hVf70KDAXNR gm86MPATVrADihvi/hiFNUsjMrZPTc3lgr+VHgCsvpQokdEzeRMVn2NAa1gd57s0PlD8 yPMUUZ5oQ0JXNIqL9F8i/Scu4RUhd09EE02spP+0QG0CcvRvLmkw8/Gn/ontQgQrRZLy c/3n2XaxCFm37RyYx5QsEJMfBw72V5ZLSrSxbahMirzw4jIhuhx3y794jlhATaKde99s KnX7+izp+FVB/fnj9DiHnf1GpxoQk91vGXI3OKuJzAybsWTCzwNP3z88ci2/J5NibfBU 8VrQ== X-Gm-Message-State: AOJu0YwdFCtlKanH9SfwfuQUYolXs9uIrwB6x4YNnuumnaOLAvlYuYFD /RpkvHSAALJyFxi/xCEk/ohsaKDxNPlsmg== X-Google-Smtp-Source: AGHT+IHBzgPGDtKPtbfiYMnilahBwP5Whg/tOnaxsAejKLrfiqFXHpL0mzLUcz9uR5GPzjGe/j16kA== X-Received: by 2002:a17:90a:7ac7:b0:286:d6fb:3d4f with SMTP id b7-20020a17090a7ac700b00286d6fb3d4fmr3054422pjl.24.1703535800508; Mon, 25 Dec 2023 12:23:20 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:20 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 3/6] Staging: rtl8192e: Rename variable NumRxOkInPeriod Date: Mon, 25 Dec 2023 12:23:11 -0800 Message-Id: <20231225202314.31869-4-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable NumRxOkInPeriod to num_rx_ok_in_period to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index b2c56e2099ce..6815d18a7919 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -971,14 +971,14 @@ static void _rtl92e_watchdog_wq_cb(void *data) } } if ((ieee->link_state =3D=3D MAC80211_LINKED) && (ieee->iw_mode =3D=3D IW= _MODE_INFRA)) { - if (ieee->link_detect_info.NumRxOkInPeriod > 100 || + if (ieee->link_detect_info.num_rx_ok_in_period > 100 || ieee->link_detect_info.num_tx_ok_in_period > 100) bBusyTraffic =3D true; =20 - if (ieee->link_detect_info.NumRxOkInPeriod > 4000 || + if (ieee->link_detect_info.num_rx_ok_in_period > 4000 || ieee->link_detect_info.num_tx_ok_in_period > 4000) { bHigherBusyTraffic =3D true; - if (ieee->link_detect_info.NumRxOkInPeriod > 5000) + if (ieee->link_detect_info.num_rx_ok_in_period > 5000) bHigherBusyRxTraffic =3D true; else bHigherBusyRxTraffic =3D false; @@ -1003,7 +1003,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) rtl92e_leisure_ps_leave(dev); } =20 - ieee->link_detect_info.NumRxOkInPeriod =3D 0; + ieee->link_detect_info.num_rx_ok_in_period =3D 0; ieee->link_detect_info.num_tx_ok_in_period =3D 0; ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; ieee->link_detect_info.bBusyTraffic =3D bBusyTraffic; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b56a8e1ce474..42690b3d03bd 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1119,7 +1119,7 @@ struct rt_link_detect { u16 SlotIndex; =20 u32 num_tx_ok_in_period; - u32 NumRxOkInPeriod; + u32 num_rx_ok_in_period; u32 NumRxUnicastOkInPeriod; bool bBusyTraffic; bool bHigherBusyTraffic; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 80e4e5b8de89..d346380fd1d1 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1285,7 +1285,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, =20 /* Update statstics for AP roaming */ ieee->link_detect_info.NumRecvDataInPeriod++; - ieee->link_detect_info.NumRxOkInPeriod++; + ieee->link_detect_info.num_rx_ok_in_period++; =20 /* Data frame - extract src/dst addresses */ rtllib_rx_extract_addr(ieee, hdr, dst, src, bssid); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index b30533f92b53..9b00fb68f1a4 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2077,7 +2077,7 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_detect_info.NumRecvBcnInPeriod =3D 0; ieee->link_detect_info.NumRecvDataInPeriod =3D 0; ieee->link_detect_info.num_tx_ok_in_period =3D 0; - ieee->link_detect_info.NumRxOkInPeriod =3D 0; + ieee->link_detect_info.num_rx_ok_in_period =3D 0; ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; ieee->bIsAggregateFrame =3D false; ieee->assoc_id =3D 0; --=20 2.39.2 From nobody Sat Dec 27 01:12:17 2025 Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C82053E0E for ; Mon, 25 Dec 2023 20:23:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="KgkcUrwv" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-58dd3528497so2304762eaf.3 for ; Mon, 25 Dec 2023 12:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535801; x=1704140601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cz8hG91T0FVlhJJL7ezEdRKii6A5vAGbqjcOF3Xr0Yo=; b=KgkcUrwvuNi7chmOuJb/3+zFp9nw63Tmy0R59yq/8xa6PgeoBJt6FQ8ZQ0h7IjoMl7 c1aDfV+8Wr979Y1aZEny6Su2amuaf1NAGHO47gJ+Rb9/1d1oJmm0lFhqRRrBrinCx4ol RD9Oqc3CiNiS2xBtO2pZU1DD9TG9mqg2113xNGj9BCQ4EO1Lq0XW7H5Po0Ouww8YqfOV 79x+X+msr+gKiHb1q6v+xGQXsISahKxRQWrjX7FOd6TcsYuTsVUc5CU5wHy/dKAQVaN9 D8LLBolmUBVS35Xw4GB7bFLTrv5R59ciSPS/N9SKUpwNMLsKK/n7lk3YSGS9rEKjdGjv 9S8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535801; x=1704140601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cz8hG91T0FVlhJJL7ezEdRKii6A5vAGbqjcOF3Xr0Yo=; b=VFYRq+tuF0M4p1KTo1OH1ppwcTdO9ksK/fiUplwx94TV14aLF+6U/ZqMQY2oNTsbE0 zXR+EKNFB61Qw3sVPPpOPIYsVSra+1pbc034T63b3c6bpZ1dl8Blt9wGvAX5g4Q/qXSN BKtHDVURcrclZ8lalCQ+m8MCQOTgLeOP8wrrpO5EOE6jVxLmhBHACfctizHKpVTAso1+ xMcBB0YJtlJD7JFRMadhoWyxO9FMly8HhvB9LDOeuvSU7+79gmt+ecVbMm43SMpYQPc0 wSoPsprJJZ6KsmqRH4GW4MGIYbpMpBmFJgn8dx59P/aU7uZ0imeU8t/urUHOzK8Y1d4c pohw== X-Gm-Message-State: AOJu0YyZxgt0cXMObU/8d4X1pfB/4KmIxvQULLcxwB7mPlps8wL3o4Df tJouSEZRrpO2O9WfSki8LphB6FJ6Bsx1JA== X-Google-Smtp-Source: AGHT+IF5aN1SmkVBKdNildtbgH7ZCUqUVEwwO5CvpL/TbdHrjZmOhcf9IEsYuOuFcl+8xBvuLajwrA== X-Received: by 2002:a05:6358:6f8d:b0:170:e2dc:3e19 with SMTP id s13-20020a0563586f8d00b00170e2dc3e19mr5009259rwn.43.1703535801553; Mon, 25 Dec 2023 12:23:21 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:20 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 4/6] Staging: rtl8192e: Rename function rtllib_EnableNetMonitorMode() Date: Mon, 25 Dec 2023 12:23:12 -0800 Message-Id: <20231225202314.31869-5-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename function rtllib_EnableNetMonitorModeto to rtllib_enable_net_monitor_= mode to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 42690b3d03bd..a2148bf0cea3 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1677,7 +1677,7 @@ void rtllib_sta_ps_send_pspoll_frame(struct rtllib_de= vice *ieee); void rtllib_start_protocol(struct rtllib_device *ieee); void rtllib_stop_protocol(struct rtllib_device *ieee); =20 -void rtllib_EnableNetMonitorMode(struct net_device *dev, bool init_state); +void rtllib_enable_net_monitor_mode(struct net_device *dev, bool init_stat= e); void rtllib_disable_net_monitor_mode(struct net_device *dev, bool init_sta= te); =20 void rtllib_softmac_stop_protocol(struct rtllib_device *ieee); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 9b00fb68f1a4..c0c33ae06908 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -348,7 +348,7 @@ static inline struct sk_buff *rtllib_probe_req(struct r= tllib_device *ieee) } =20 /* Enables network monitor mode, all rx packets will be received. */ -void rtllib_EnableNetMonitorMode(struct net_device *dev, +void rtllib_enable_net_monitor_mode(struct net_device *dev, bool init_state) { struct rtllib_device *ieee =3D netdev_priv_rsl(dev); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index eb331cbb9850..2afa701e5445 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -266,7 +266,7 @@ int rtllib_wx_set_mode(struct rtllib_device *ieee, stru= ct iw_request_info *a, =20 if (wrqu->mode =3D=3D IW_MODE_MONITOR) { ieee->dev->type =3D ARPHRD_IEEE80211; - rtllib_EnableNetMonitorMode(ieee->dev, false); + rtllib_enable_net_monitor_mode(ieee->dev, false); } else { ieee->dev->type =3D ARPHRD_ETHER; if (ieee->iw_mode =3D=3D IW_MODE_MONITOR) --=20 2.39.2 From nobody Sat Dec 27 01:12:17 2025 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C9C653E24 for ; Mon, 25 Dec 2023 20:23:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="XfjKxnIZ" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so3081228a12.1 for ; Mon, 25 Dec 2023 12:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535802; x=1704140602; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yB/NPRklIQX18vFPp18HnciRsryoXB+/DvCLU44035c=; b=XfjKxnIZyhiJ2m6PXIlsmZ5ufcKls1ujOT2EvW4w+g8KuHGgP5btxYcii/zokyjrXN GmjRomVxOqggeKmilV/RMScf/pXuElDJTCoVYZDWOcDnpVukd+UT/CbNKIh0ADls5MVm E6D7wQSDAZdLg1vNIJ8ooc+LgSmCtrKnn+tEZrGQyw4HJJuS6gZyHxtRJX80ow+JxJ4M 86d+1DK9VvCZ0SVeKTkku/FUn4cnh+snnUw5M8AFmZV7VdxhOUjEUTUYG2PjsenEZdKt 4Qzf3v1cDqHB+4MdCOkVH+s1Xgfu1fqNktl93668WlRSiBt/mAMAQzEuhuRe8Gl9nTJv VwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535802; x=1704140602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yB/NPRklIQX18vFPp18HnciRsryoXB+/DvCLU44035c=; b=MfVAomdil7Ta7sN1pTsemIF1/LMIxgG9A6Wjjfc1nQN38HBMPkoVVs+HoFq2GoE7oo PlQgZ0UPncgJ7WEfb2sllbdEEldIGxX6XCLibqxHaVt8yu870sAHplKiDkaZjdnnHhPz uMD8YreK2VBpirv2rk/xlp0WzYYWSNBFXWDU3fUfIoR1YsZXNdqEJ9J7qIWDLu2h6wVT ObqJpa2suIbgUZnHIgQqGAqbgfge0UXxxl8tLtBRQoKDCATwqvsccK+qKeOiRgSJdrHu UPeUfdQMOTsiV09y3sJGoIXp+eAv7Vp1ZbSkC2P/xwcfukAPoFkRU/lsrnmfbXH4fJ7u UGYw== X-Gm-Message-State: AOJu0Yw6NZz0ZJK0M1ZmjOytF+eVgASE2AmhfbsPRmdmDV5EMCdpdFSr wuTTkWtImx6T+IBAGHsB1azCUflVTvaT1Abwpy+j5FAaCgU= X-Google-Smtp-Source: AGHT+IEkZIOKUIPikir73sUYhv3D61CLAKChYIpOJiHP27SsKO7k81a0TQwQzNoytrFJ9uos1IDCig== X-Received: by 2002:a17:903:26cd:b0:1d3:2a94:cb53 with SMTP id jg13-20020a17090326cd00b001d32a94cb53mr7021854plb.5.1703535802350; Mon, 25 Dec 2023 12:23:22 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:22 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 5/6] Staging: rtl8192e: Rename variable bIsAggregateFrame Date: Mon, 25 Dec 2023 12:23:13 -0800 Message-Id: <20231225202314.31869-6-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable bIsAggregateFrame to is_aggregate_frame to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 10 +++++----- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index a2148bf0cea3..df72504e9695 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1402,7 +1402,7 @@ struct rtllib_device { bool FwRWRF; =20 struct rt_link_detect link_detect_info; - bool bIsAggregateFrame; + bool is_aggregate_frame; struct rt_pwr_save_ctrl pwr_save_ctrl; =20 /* used if IEEE_SOFTMAC_TX_QUEUE is set */ diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index d346380fd1d1..a5d530af18c4 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -730,7 +730,7 @@ static u8 parse_subframe(struct rtllib_device *ieee, st= ruct sk_buff *skb, =20 u16 LLCOffset =3D sizeof(struct ieee80211_hdr_3addr); u16 ChkLength; - bool bIsAggregateFrame =3D false; + bool is_aggregate_frame =3D false; u16 nSubframe_Length; u8 nPadding_Length =3D 0; u16 SeqNum =3D 0; @@ -739,7 +739,7 @@ static u8 parse_subframe(struct rtllib_device *ieee, st= ruct sk_buff *skb, SeqNum =3D WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctrl)); if ((RTLLIB_QOS_HAS_SEQ(fc)) && (((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved)) - bIsAggregateFrame =3D true; + is_aggregate_frame =3D true; =20 if (RTLLIB_QOS_HAS_SEQ(fc)) LLCOffset +=3D 2; @@ -752,8 +752,8 @@ static u8 parse_subframe(struct rtllib_device *ieee, st= ruct sk_buff *skb, return 0; =20 skb_pull(skb, LLCOffset); - ieee->bIsAggregateFrame =3D bIsAggregateFrame; - if (!bIsAggregateFrame) { + ieee->is_aggregate_frame =3D is_aggregate_frame; + if (!is_aggregate_frame) { rxb->nr_subframes =3D 1; =20 /* altered by clark 3/30/2010 @@ -1358,7 +1358,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, /* Update WAPI PN */ =20 /* Check if leave LPS */ - if (ieee->bIsAggregateFrame) + if (ieee->is_aggregate_frame) nr_subframes =3D rxb->nr_subframes; else nr_subframes =3D 1; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index c0c33ae06908..66816155ff36 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2079,7 +2079,7 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_detect_info.num_tx_ok_in_period =3D 0; ieee->link_detect_info.num_rx_ok_in_period =3D 0; ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; - ieee->bIsAggregateFrame =3D false; + ieee->is_aggregate_frame =3D false; ieee->assoc_id =3D 0; ieee->queue_stop =3D 0; ieee->scanning_continue =3D 0; --=20 2.39.2 From nobody Sat Dec 27 01:12:17 2025 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02BBA54656 for ; Mon, 25 Dec 2023 20:23:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=darkphysics.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=darkphysics.net header.i=@darkphysics.net header.b="NRyAe3Xa" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so3081234a12.1 for ; Mon, 25 Dec 2023 12:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1703535803; x=1704140603; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YY8Yj/DU7Ru4GTNDSXSvBwYAcH02TIn/sHGmgQuRGjQ=; b=NRyAe3XarxgcwZFjHGxUqY2syzI2BbLRx0HBomOaEWtEq5Pn4KvVWS7r5gxU2vHzlE tIgq+zjjEi0E0H52JCfW4De62b0vJFyOIatrEyPK3ilgm/40nf8kTkIcdQS0nmZpNZiP NlrKkkOupfAhsnJCsbVspc2zFTI/IAircxDxrj7p3PRmeXhcwdOF5hkqGvgSPd0zjrqx Fneq5keSVS6v9NP25AlwcYdtX8r1w9xqYKcWOUk5DpOAiEMsf8DuBBfEcAUnhfLyWWDw oW96M3S1yrCCBgReFddNJynuEEQBxz4V/4D1/rbjBRtmCGMbnfApp2WtsX0phncsR2rB DByw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703535803; x=1704140603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YY8Yj/DU7Ru4GTNDSXSvBwYAcH02TIn/sHGmgQuRGjQ=; b=hZUZsS0ZgZ8VC602p+ac+jTrQDGP3PEWM+d9AGG3u3LXOAkAS0mOAjU48OPi6bWpVU z/XeCluOW2bHFs2Cc2Vl0YBpMJTrPo0chIzbBQvsJDOotlzdgO/+sOgk2UPJelsWgSe5 g83HGolfHJ4NwAXjOiFRRk+l9wJQsopumhJmgMTY+/XKajyYiDXyl5LBUNmUAdip/lpX UoWp7h0FUwTWeO3ge+lgjPzyk4oiDcnelpkBmArfcRGVeG/1c0TkETrNYD96kISPtErD BVHdDZlvpV+HYrjnHvTONS/x8mDNNDeG1j3wf8Hy3qW5+KvN9TlvSHz09W4IUraUcyH2 WZKw== X-Gm-Message-State: AOJu0Yx1aczDpYFF/nhMJ8pGCijJ2uWY2D7LZmjggL46sQKRCiKCamKM Y35U4tN2lyPnWow+EeY6J4Fnw0HXI35FQQ== X-Google-Smtp-Source: AGHT+IGxHy/lP2tgU3DLHGT71bu/t8Q4GMnCMpTPBHGajLrEVlge7LrR8vjYqJuBYy2IMgfQz9JHkg== X-Received: by 2002:a17:902:680b:b0:1d4:638f:3ff6 with SMTP id h11-20020a170902680b00b001d4638f3ff6mr945916plk.66.1703535803407; Mon, 25 Dec 2023 12:23:23 -0800 (PST) Received: from oatmeal.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id l17-20020a17090aaa9100b0028be5732f01sm8741246pjq.0.2023.12.25.12.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 12:23:22 -0800 (PST) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 6/6] Staging: rtl8192e: Rename variable OpMode Date: Mon, 25 Dec 2023 12:23:14 -0800 Message-Id: <20231225202314.31869-7-tdavies@darkphysics.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231225202314.31869-1-tdavies@darkphysics.net> References: <20231225202314.31869-1-tdavies@darkphysics.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable OpMode to op_mode to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index ed0c152c2477..c7a2eae2fdb9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -51,12 +51,12 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable= , u8 *val) =20 case HW_VAR_MEDIA_STATUS: { - enum rt_op_mode OpMode =3D *((enum rt_op_mode *)(val)); + enum rt_op_mode op_mode =3D *((enum rt_op_mode *)(val)); u8 btMsr =3D rtl92e_readb(dev, MSR); =20 btMsr &=3D 0xfc; =20 - switch (OpMode) { + switch (op_mode) { case RT_OP_MODE_INFRASTRUCTURE: btMsr |=3D MSR_INFRA; break; @@ -1693,12 +1693,12 @@ void rtl92e_stop_adapter(struct net_device *dev, bo= ol reset) { struct r8192_priv *priv =3D rtllib_priv(dev); int i; - u8 OpMode; + u8 op_mode; u8 u1bTmp; u32 ulRegRead; =20 - OpMode =3D RT_OP_MODE_NO_LINK; - priv->rtllib->SetHwRegHandler(dev, HW_VAR_MEDIA_STATUS, &OpMode); + op_mode =3D RT_OP_MODE_NO_LINK; + priv->rtllib->SetHwRegHandler(dev, HW_VAR_MEDIA_STATUS, &op_mode); =20 if (!priv->rtllib->bSupportRemoteWakeUp) { u1bTmp =3D 0x0; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index df72504e9695..4ce80239b8b3 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1187,7 +1187,7 @@ struct rtllib_device { unsigned long status; u8 CntAfterLink; =20 - enum rt_op_mode OpMode; + enum rt_op_mode op_mode; =20 /* The last AssocReq/Resp IEs */ u8 *assocreq_ies, *assocresp_ies; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 66816155ff36..80e323030f5f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2245,7 +2245,7 @@ static void rtllib_MlmeDisassociateRequest(struct rtl= lib_device *rtllib, u8 *asSta, u8 asRsn) { u8 i; - u8 OpMode; + u8 op_mode; =20 RemovePeerTS(rtllib, asSta); =20 @@ -2254,10 +2254,10 @@ static void rtllib_MlmeDisassociateRequest(struct r= tllib_device *rtllib, =20 for (i =3D 0; i < 6; i++) rtllib->current_network.bssid[i] =3D 0x22; - OpMode =3D RT_OP_MODE_NO_LINK; - rtllib->OpMode =3D RT_OP_MODE_NO_LINK; + op_mode =3D RT_OP_MODE_NO_LINK; + rtllib->op_mode =3D RT_OP_MODE_NO_LINK; rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_MEDIA_STATUS, - (u8 *)(&OpMode)); + (u8 *)(&op_mode)); rtllib_disassociate(rtllib); =20 rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_BSSID, --=20 2.39.2