From: Alberto Merciai <alb3rt0.m3rciai@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: alb3rt0.m3rciai@gmail.com, linuxfancy@googlegroups.com,
Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michael Straube <straube.linux@gmail.com>,
Martin Kaiser <martin@kaiser.cx>,
"Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Saurav Girepunje <saurav.girepunje@gmail.com>,
Ivan Safonov <insafonov@gmail.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Zameer Manji <zmanji@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 55/56] staging: r8188eu: rename camelcase GetAddr3Ptr to get_addr_3_ptr
Date: Mon, 3 Jan 2022 20:02:30 +0100 [thread overview]
Message-ID: <20220103190326.363960-56-alb3rt0.m3rciai@gmail.com> (raw)
In-Reply-To: <20220103190326.363960-1-alb3rt0.m3rciai@gmail.com>
Rename camel case macro GetAddr3Ptr into get_addr_3_ptr
Signed-off-by: Alberto Merciai <alb3rt0.m3rciai@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 18 +++++++++---------
drivers/staging/r8188eu/core/rtw_recv.c | 4 ++--
drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +-
drivers/staging/r8188eu/include/wifi.h | 10 +++++-----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 491cba1a007a..00c56ae5d1b1 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -627,7 +627,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
return _SUCCESS;
}
- if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {
+ if (!memcmp(get_addr_3_ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {
if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) {
/* we should update current network before auth, or some IE is wrong */
pbss = kmalloc(sizeof(struct wlan_bssid_ex), GFP_ATOMIC);
@@ -1490,7 +1490,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
/* check A3 */
- if (!(!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
+ if (!(!memcmp(get_addr_3_ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
return _SUCCESS;
if (pwdinfo->rx_invitereq_info.scan_op_ch_only) {
@@ -1546,10 +1546,10 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
netdev_dbg(padapter->pnetdev,
"sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
- reason, GetAddr3Ptr(pframe), ignore_received_deauth);
+ reason, get_addr_3_ptr(pframe), ignore_received_deauth);
if (!ignore_received_deauth)
- receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
+ receive_disconnect(padapter, get_addr_3_ptr(pframe), reason);
}
pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
return _SUCCESS;
@@ -1565,7 +1565,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
/* check A3 */
- if (!(!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
+ if (!(!memcmp(get_addr_3_ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
return _SUCCESS;
if (pwdinfo->rx_invitereq_info.scan_op_ch_only) {
@@ -1604,9 +1604,9 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
} else {
netdev_dbg(padapter->pnetdev,
"ap recv disassoc reason code(%d) sta:%pM\n",
- reason, GetAddr3Ptr(pframe));
+ reason, get_addr_3_ptr(pframe));
- receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
+ receive_disconnect(padapter, get_addr_3_ptr(pframe), reason);
}
pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
return _SUCCESS;
@@ -4966,7 +4966,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
memcpy((void *)get_addr_1_ptr(pwlanhdr), pstat->hwaddr, ETH_ALEN);
memcpy((void *)get_addr_2_ptr(pwlanhdr), myid(&padapter->eeprompriv), ETH_ALEN);
- memcpy((void *)GetAddr3Ptr(pwlanhdr), get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
+ memcpy((void *)get_addr_3_ptr(pwlanhdr), get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
set_seq_num(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@@ -6324,7 +6324,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
memcpy(bssid->MacAddress, get_addr_2_ptr(pframe), ETH_ALEN);
} else {
bssid->InfrastructureMode = Ndis802_11IBSS;
- memcpy(bssid->MacAddress, GetAddr3Ptr(pframe), ETH_ALEN);
+ memcpy(bssid->MacAddress, get_addr_3_ptr(pframe), ETH_ALEN);
}
if (val16 & BIT(4))
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 3aad16af3a60..a6ee7dd9b3e4 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -633,7 +633,7 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame,
} else if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
memcpy(pattrib->dst, get_addr_1_ptr(ptr), ETH_ALEN);
memcpy(pattrib->src, get_addr_2_ptr(ptr), ETH_ALEN);
- memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
+ memcpy(pattrib->bssid, get_addr_3_ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
@@ -720,7 +720,7 @@ static int ap2sta_data_frame(
check_fwstate(pmlmepriv, _FW_LINKED)) {
memcpy(pattrib->dst, get_addr_1_ptr(ptr), ETH_ALEN);
memcpy(pattrib->src, get_addr_2_ptr(ptr), ETH_ALEN);
- memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
+ memcpy(pattrib->bssid, get_addr_3_ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index 5f4c9d61511e..8f0cd8c85391 100644
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -844,7 +844,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
int group_cipher = 0, pairwise_cipher = 0, is_8021x = 0;
unsigned char *pbuf;
u32 wpa_ielen = 0;
- u8 *pbssid = GetAddr3Ptr(pframe);
+ u8 *pbssid = get_addr_3_ptr(pframe);
u32 hidden_ssid = 0;
struct HT_info_element *pht_info = NULL;
struct ieee80211_ht_cap *pht_cap = NULL;
diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
index 9ce45d31e16d..9d8d69cc562a 100644
--- a/drivers/staging/r8188eu/include/wifi.h
+++ b/drivers/staging/r8188eu/include/wifi.h
@@ -254,7 +254,7 @@ enum WIFI_REG_DOMAIN {
#define get_addr_2_ptr(pbuf) ((unsigned char *)((size_t)(pbuf) + 10))
-#define GetAddr3Ptr(pbuf) ((unsigned char *)((size_t)(pbuf) + 16))
+#define get_addr_3_ptr(pbuf) ((unsigned char *)((size_t)(pbuf) + 16))
#define GetAddr4Ptr(pbuf) ((unsigned char *)((size_t)(pbuf) + 24))
@@ -279,10 +279,10 @@ static inline unsigned char *get_da(unsigned char *pframe)
da = get_addr_1_ptr(pframe);
break;
case 0x02: /* ToDs=1, FromDs=0 */
- da = GetAddr3Ptr(pframe);
+ da = get_addr_3_ptr(pframe);
break;
default: /* ToDs=1, FromDs=1 */
- da = GetAddr3Ptr(pframe);
+ da = get_addr_3_ptr(pframe);
break;
}
return da;
@@ -298,7 +298,7 @@ static inline unsigned char *get_sa(unsigned char *pframe)
sa = get_addr_2_ptr(pframe);
break;
case 0x01: /* ToDs=0, FromDs=1 */
- sa = GetAddr3Ptr(pframe);
+ sa = get_addr_3_ptr(pframe);
break;
case 0x02: /* ToDs=1, FromDs=0 */
sa = get_addr_2_ptr(pframe);
@@ -317,7 +317,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
switch (to_fr_ds) {
case 0x00: /* ToDs=0, FromDs=0 */
- sa = GetAddr3Ptr(pframe);
+ sa = get_addr_3_ptr(pframe);
break;
case 0x01: /* ToDs=0, FromDs=1 */
sa = get_addr_2_ptr(pframe);
--
2.25.1
next prev parent reply other threads:[~2022-01-03 19:57 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 19:01 [PATCH 00/56] staging: r8188eu: wifi.h macros refactoring Alberto Merciai
2022-01-03 19:01 ` [PATCH 01/56] staging: r8188eu: add parenthesis to macro SetToDs Alberto Merciai
2022-01-06 14:12 ` Greg Kroah-Hartman
2022-01-03 19:01 ` [PATCH 02/56] staging: r8188eu: rename camelcase SetToDs to set_to_ds Alberto Merciai
2022-01-06 14:13 ` Greg Kroah-Hartman
2022-01-03 19:01 ` [PATCH 03/56] staging: r8188eu: remove dead macro ClearToDs Alberto Merciai
2022-01-06 14:14 ` Greg Kroah-Hartman
2022-01-08 13:53 ` Alberto Merciai
2022-01-03 19:01 ` [PATCH 04/56] staging: r8188eu: add parenthesis to macro SetFrDs Alberto Merciai
2022-01-03 19:01 ` [PATCH 05/56] staging: r8188eu: rename camelcase SetFrDs to set_fr_ds Alberto Merciai
2022-01-03 19:01 ` [PATCH 06/56] staging: r8188eu: remove dead macro ClearFrDs Alberto Merciai
2022-01-03 19:01 ` [PATCH 07/56] staging: r8188eu: add parenthesis to macro SetMFrag Alberto Merciai
2022-01-03 19:01 ` [PATCH 08/56] staging: r8188eu: rename camelcase SetMFrag to set_m_frag Alberto Merciai
2022-01-03 19:01 ` [PATCH 09/56] staging: r8188eu: rename camelcase GetToDs to get_to_ds Alberto Merciai
2022-01-03 19:01 ` [PATCH 10/56] staging: r8188eu: rename camelcase GetFrDs to get_fr_ds Alberto Merciai
2022-01-03 19:01 ` [PATCH 11/56] staging: r8188eu: rename camelcase GetMFrag to get_m_frag Alberto Merciai
2022-01-03 19:01 ` [PATCH 12/56] staging: r8188eu: rename camelcase ClearMFrag to clear_m_frag Alberto Merciai
2022-01-03 19:01 ` [PATCH 13/56] staging: r8188eu: add parenthesis to macro clear_m_frag Alberto Merciai
2022-01-03 19:01 ` [PATCH 14/56] staging: r8188eu: remove dead macro SetRetry Alberto Merciai
2022-01-03 19:01 ` [PATCH 15/56] staging: r8188eu: rename camelcase GetRetry to get_retry Alberto Merciai
2022-01-03 19:01 ` [PATCH 16/56] staging: r8188eu: remove dead macro ClearRetry Alberto Merciai
2022-01-03 19:01 ` [PATCH 17/56] staging: r8188eu: rename camelcase SetPwrMgt to set_pwr_mgt Alberto Merciai
2022-01-03 19:01 ` [PATCH 18/56] staging: r8188eu: add parenthesis to macro set_pwr_mgt Alberto Merciai
2022-01-03 19:01 ` [PATCH 19/56] staging: r8188eu: rename camelcase GetPwrMgt to get_pwr_mgt Alberto Merciai
2022-01-03 19:01 ` [PATCH 20/56] staging: r8188eu: remove dead macro ClearPwrMgt Alberto Merciai
2022-01-03 19:01 ` [PATCH 21/56] staging: r8188eu: rename camelcase SetMData to set_m_data Alberto Merciai
2022-01-03 19:01 ` [PATCH 22/56] staging: r8188eu: add parenthesis to macro set_m_data Alberto Merciai
2022-01-03 19:01 ` [PATCH 23/56] staging: r8188eu: rename camelcase GetMData to get_m_data Alberto Merciai
2022-01-03 19:01 ` [PATCH 24/56] staging: r8188eu: remove dead macro ClearMData Alberto Merciai
2022-01-03 19:02 ` [PATCH 25/56] staging: r8188eu: rename camelcase SetPrivacy to set_privacy Alberto Merciai
2022-01-03 19:02 ` [PATCH 26/56] staging: r8188eu: add parenthesis to macro set_privacy Alberto Merciai
2022-01-03 19:02 ` [PATCH 27/56] staging: r8188eu: rename camelcase GetPrivacy to get_privacy Alberto Merciai
2022-01-03 19:02 ` [PATCH 28/56] staging: r8188eu: remove dead macro ClearPrivacy Alberto Merciai
2022-01-03 19:02 ` [PATCH 29/56] staging: r8188eu: rename camelcase GetOrder to get_order Alberto Merciai
2022-01-03 19:02 ` [PATCH 30/56] staging: r8188eu: rename camelcase GetFrameType to get_frame_type Alberto Merciai
2022-01-03 19:02 ` [PATCH 31/56] staging: r8188eu: remove dead macro SetFrameType Alberto Merciai
2022-01-03 19:02 ` [PATCH 32/56] staging: r8188eu: rename camelcase GetFrameSubType to get_frame_subtype Alberto Merciai
2022-01-03 19:02 ` [PATCH 33/56] staging: r8188eu: rename camelcase SetFrameSubType to set_frame_subtype Alberto Merciai
2022-01-03 19:02 ` [PATCH 34/56] staging: r8188eu: rename camelcase GetSequence to get_sequence Alberto Merciai
2022-01-03 19:02 ` [PATCH 35/56] staging: r8188eu: rename camelcase GetFragNum to get_frag_num Alberto Merciai
2022-01-03 19:02 ` [PATCH 36/56] staging: r8188eu: remove dead macro GetTupleCache Alberto Merciai
2022-01-03 19:02 ` [PATCH 37/56] staging: r8188eu: remove dead macro SetFragNum Alberto Merciai
2022-01-03 19:02 ` [PATCH 38/56] staging: r8188eu: rename camelcase SetSeqNum to set_seq_num Alberto Merciai
2022-01-03 19:02 ` [PATCH 39/56] staging: r8188eu: rename camelcase SetDuration to set_duration Alberto Merciai
2022-01-03 19:02 ` [PATCH 40/56] staging: r8188eu: rename camelcase SetPriority to set_priority Alberto Merciai
2022-01-03 19:02 ` [PATCH 41/56] staging: r8188eu: add parenthesis to macro set_duration Alberto Merciai
2022-01-03 19:02 ` [PATCH 42/56] staging: r8188eu: add parenthesis to macro set_priority Alberto Merciai
2022-01-03 19:02 ` [PATCH 43/56] staging: r8188eu: rename camelcase GetPriority to get_priority Alberto Merciai
2022-01-03 19:02 ` [PATCH 44/56] staging: r8188eu: rename camelcase SetEOSP to set_eosp Alberto Merciai
2022-01-03 19:02 ` [PATCH 45/56] staging: r8188eu: add parenthesis to macro set_eosp Alberto Merciai
2022-01-03 19:02 ` [PATCH 46/56] staging: r8188eu: remove dead macro GetTid Alberto Merciai
2022-01-03 19:02 ` [PATCH 47/56] staging: r8188eu: rename camelcase SetAckpolicy to set_ack_policy Alberto Merciai
2022-01-03 19:02 ` [PATCH 48/56] staging: r8188eu: add parenthesis to macro set_ack_policy Alberto Merciai
2022-01-03 19:02 ` [PATCH 49/56] staging: r8188eu: rename camelcase GetAckpolicy into get_ack_policy Alberto Merciai
2022-01-03 19:02 ` [PATCH 50/56] staging: r8188eu: rename camelcase GetAMsdu to get_a_msdu Alberto Merciai
2022-01-03 19:02 ` [PATCH 51/56] staging: r8188eu: remove dead macro SetAMsdu Alberto Merciai
2022-01-03 19:02 ` [PATCH 52/56] staging: r8188eu: rename camelcase GetAid to get_aid Alberto Merciai
2022-01-03 19:02 ` [PATCH 53/56] staging: r8188eu: rename camelcase GetAddr1Ptr to get_addr_1_ptr Alberto Merciai
2022-01-03 19:02 ` [PATCH 54/56] staging: r8188eu: rename camelcase GetAddr2Ptr to get_addr_2_ptr Alberto Merciai
2022-01-03 19:02 ` Alberto Merciai [this message]
2022-01-03 19:02 ` [PATCH 56/56] staging: r8188eu: rename camelcase GetAddr4Ptr to get_addr_4_ptr Alberto Merciai
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=20220103190326.363960-56-alb3rt0.m3rciai@gmail.com \
--to=alb3rt0.m3rciai@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dan.carpenter@oracle.com \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=insafonov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linuxfancy@googlegroups.com \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
--cc=saurav.girepunje@gmail.com \
--cc=straube.linux@gmail.com \
--cc=zmanji@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
all inboxes | Powered by JetHome®