From: Tree Davies <tdavies@darkphysics.net>
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 <tdavies@darkphysics.net>
Subject: [PATCH 12/20] Staging: rtl8192e: Rename variable asRsn
Date: Sun, 25 Feb 2024 19:56:16 -0800 [thread overview]
Message-ID: <20240226035624.370443-13-tdavies@darkphysics.net> (raw)
In-Reply-To: <20240226035624.370443-1-tdavies@darkphysics.net>
Rename variable asRsn to rsn to fix checkpatch warning
Avoid CamelCase, and adjust spacing to avoid alignment check.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtllib.h | 4 ++--
drivers/staging/rtl8192e/rtllib_softmac.c | 24 +++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index c703e6d95fb9..a5925fe75a6a 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1662,7 +1662,7 @@ int rtllib_rx_frame_softmac(struct rtllib_device *ieee, struct sk_buff *skb,
void rtllib_softmac_new_net(struct rtllib_device *ieee,
struct rtllib_network *net);
-void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn);
+void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn);
void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee);
int rtllib_softmac_init(struct rtllib_device *ieee);
@@ -1805,7 +1805,7 @@ static inline const char *escape_essid(const char *essid, u8 essid_len)
}
/* fun with the built-in rtllib stack... */
-bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn);
+bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn);
/* For the function is more related to hardware setting, it's better to use the
* ieee handler to refer to it.
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 4ab4cf6e1197..e59cd2792389 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2144,7 +2144,7 @@ void rtllib_softmac_free(struct rtllib_device *ieee)
static inline struct sk_buff *
rtllib_disauth_skb(struct rtllib_network *beacon,
- struct rtllib_device *ieee, u16 asRsn)
+ struct rtllib_device *ieee, u16 rsn)
{
struct sk_buff *skb;
struct rtllib_disauth *disauth;
@@ -2164,13 +2164,13 @@ rtllib_disauth_skb(struct rtllib_network *beacon,
ether_addr_copy(disauth->header.addr2, ieee->dev->dev_addr);
ether_addr_copy(disauth->header.addr3, beacon->bssid);
- disauth->reason = cpu_to_le16(asRsn);
+ disauth->reason = cpu_to_le16(rsn);
return skb;
}
static inline struct sk_buff *
rtllib_disassociate_skb(struct rtllib_network *beacon,
- struct rtllib_device *ieee, u16 asRsn)
+ struct rtllib_device *ieee, u16 rsn)
{
struct sk_buff *skb;
struct rtllib_disassoc *disass;
@@ -2191,19 +2191,19 @@ rtllib_disassociate_skb(struct rtllib_network *beacon,
ether_addr_copy(disass->header.addr2, ieee->dev->dev_addr);
ether_addr_copy(disass->header.addr3, beacon->bssid);
- disass->reason = cpu_to_le16(asRsn);
+ disass->reason = cpu_to_le16(rsn);
return skb;
}
-void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn)
+void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn)
{
struct rtllib_network *beacon = &ieee->current_network;
struct sk_buff *skb;
if (deauth)
- skb = rtllib_disauth_skb(beacon, ieee, asRsn);
+ skb = rtllib_disauth_skb(beacon, ieee, rsn);
else
- skb = rtllib_disassociate_skb(beacon, ieee, asRsn);
+ skb = rtllib_disassociate_skb(beacon, ieee, rsn);
if (skb)
softmac_mgmt_xmit(skb, ieee);
@@ -2238,7 +2238,7 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee)
}
static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib,
- u8 *asSta, u8 asRsn)
+ u8 *asSta, u8 rsn)
{
u8 i;
u8 op_mode;
@@ -2261,7 +2261,7 @@ static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib,
}
}
-static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn)
+static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 rsn)
{
bool filter_out_nonassociated_bssid = false;
@@ -2269,19 +2269,19 @@ static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn)
rtllib->set_hw_reg_handler(rtllib->dev, HW_VAR_CECHK_BSSID,
(u8 *)(&filter_out_nonassociated_bssid));
rtllib_mlme_disassociate_request(rtllib, rtllib->current_network.bssid,
- asRsn);
+ rsn);
rtllib->link_state = MAC80211_NOLINK;
}
-bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn)
+bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn)
{
if (rtllib->ps != RTLLIB_PS_DISABLED)
rtllib->sta_wake_up(rtllib->dev);
if (rtllib->link_state == MAC80211_LINKED) {
if (rtllib->iw_mode == IW_MODE_INFRA)
- rtllib_mgnt_disconnect_ap(rtllib, asRsn);
+ rtllib_mgnt_disconnect_ap(rtllib, rsn);
}
return true;
--
2.39.2
next prev parent reply other threads:[~2024-02-26 3:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 3:56 [PATCH 00/20] Staging: rtl8192e: Fix checkpatch warning for rtllib_softmac.c Tree Davies
2024-02-26 3:56 ` [PATCH 01/20] Staging: rtl8192e: Rename function rtllib_rx_ADDBAReq() Tree Davies
2024-02-26 16:59 ` Philipp Hortmann
2024-02-26 3:56 ` [PATCH 02/20] Staging: rtl8192e: Rename variable NumRecvDataInPeriod Tree Davies
2024-02-26 3:56 ` [PATCH 03/20] Staging: rtl8192e: Rename function SecIsInPMKIDList() Tree Davies
2024-02-26 3:56 ` [PATCH 04/20] Staging: rtl8192e: Rename variable PMKIDList Tree Davies
2024-02-26 3:56 ` [PATCH 05/20] Staging: rtl8192e: Rename variable Turbo_Enable Tree Davies
2024-02-26 3:56 ` [PATCH 06/20] Staging: rtl8192e: Rename variable osCcxRmCap Tree Davies
2024-02-26 3:56 ` [PATCH 07/20] Staging: rtl8192e: Rename variable bCkipSupported Tree Davies
2024-02-26 3:56 ` [PATCH 08/20] Staging: rtl8192e: Rename variable bCcxRmEnable Tree Davies
2024-02-26 3:56 ` [PATCH 09/20] Staging: rtl8192e: Rename variable CcxRmCapBuf Tree Davies
2024-02-26 3:56 ` [PATCH 10/20] Staging: rtl8192e: Rename variable BssCcxVerNumber Tree Davies
2024-02-26 3:56 ` [PATCH 11/20] Staging: rtl8192e: Rename variable CcxVerNumBuf Tree Davies
2024-02-26 3:56 ` Tree Davies [this message]
2024-02-26 3:56 ` [PATCH 13/20] Staging: rtl8192e: Rename variable AironetIeOui Tree Davies
2024-02-26 3:56 ` [PATCH 14/20] Staging: rtl8192e: Rename variable osCcxAironetIE Tree Davies
2024-02-26 3:56 ` [PATCH 15/20] Staging: rtl8192e: Rename variable CcxAironetBuf Tree Davies
2024-02-26 3:56 ` [PATCH 16/20] Staging: rtl8192e: Rename varoable osCcxVerNum Tree Davies
2024-02-26 3:56 ` [PATCH 17/20] Staging: rtl8192e: Rename varoable asSta Tree Davies
2024-02-26 3:56 ` [PATCH 18/20] Staging: rtl8192e: Rename reference AllowAllDestAddrHandler Tree Davies
2024-02-26 3:56 ` [PATCH 19/20] Staging: rtl8192e: Rename boolean variable bHalfWirelessN24GMode Tree Davies
2024-02-26 3:56 ` [PATCH 20/20] Staging: rtl8192e: Rename function MgntQuery_MgntFrameTxRate Tree Davies
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240226035624.370443-13-tdavies@darkphysics.net \
--to=tdavies@darkphysics.net \
--cc=anjan@momi.ca \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=philipp.g.hortmann@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox