| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220103190326.363960-56-alb3rt0.m3rciai@gmail.com>
Date: Mon, 3 Jan 2022 20:02:30 +0100
From: Alberto Merciai <alb3rt0.m3rciai@...il.com>
To: unlisted-recipients:; (no To-header on input)
Cc: alb3rt0.m3rciai@...il.com, linuxfancy@...glegroups.com,
Larry Finger <Larry.Finger@...inger.net>,
Phillip Potter <phil@...lpotter.co.uk>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Michael Straube <straube.linux@...il.com>,
Martin Kaiser <martin@...ser.cx>,
"Fabio M. De Francesco" <fmdefrancesco@...il.com>,
Dan Carpenter <dan.carpenter@...cle.com>,
Saurav Girepunje <saurav.girepunje@...il.com>,
Ivan Safonov <insafonov@...il.com>,
Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Zameer Manji <zmanji@...il.com>, linux-staging@...ts.linux.dev,
linux-kernel@...r.kernel.org
Subject: [PATCH 55/56] staging: r8188eu: rename camelcase GetAddr3Ptr to get_addr_3_ptr
Rename camel case macro GetAddr3Ptr into get_addr_3_ptr
Signed-off-by: Alberto Merciai <alb3rt0.m3rciai@...il.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
Powered by blists - more mailing lists