Rename camel case macro GetFrameType into get_frame_type. Signed-off-by: Alberto Merciai <alb3rt0.m3rciai@xxxxxxxxx> --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/core/rtw_recv.c | 6 +++--- drivers/staging/r8188eu/core/rtw_security.c | 4 ++-- drivers/staging/r8188eu/include/wifi.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 763f46dd1b5a..5d0901f72cd8 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -416,7 +416,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) u8 *pframe = precv_frame->rx_data; struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe)); - if (GetFrameType(pframe) != WIFI_MGT_TYPE) + if (get_frame_type(pframe) != WIFI_MGT_TYPE) return; /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 230c8198ed84..9902adf99142 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -819,7 +819,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, u8 *pframe = precv_frame->rx_data; /* uint len = precv_frame->len; */ - if (GetFrameType(pframe) != WIFI_CTRL_TYPE) + if (get_frame_type(pframe) != WIFI_CTRL_TYPE) return _FAIL; /* receive the frames that ra(a1) is my address */ @@ -1100,7 +1100,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv goto exit; } - type = GetFrameType(ptr); + type = get_frame_type(ptr); subtype = GetFrameSubType(ptr); /* bit(7)~bit(2) */ pattrib->to_fr_ds = get_tofr_ds(ptr); @@ -1345,7 +1345,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter, struct recv_fr psta_addr = pfhdr->attrib.ta; psta = rtw_get_stainfo(pstapriv, psta_addr); if (!psta) { - u8 type = GetFrameType(pfhdr->rx_data); + u8 type = get_frame_type(pfhdr->rx_data); if (type != WIFI_DATA_TYPE) { psta = rtw_get_bcmc_stainfo(padapter); pdefrag_q = &psta->sta_recvpriv.defrag_q; diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/r8188eu/core/rtw_security.c index 4e93c720c1b6..42ff5fd5ddad 100644 --- a/drivers/staging/r8188eu/core/rtw_security.c +++ b/drivers/staging/r8188eu/core/rtw_security.c @@ -972,7 +972,7 @@ static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen) u8 aes_out[16]; u8 padded_buffer[16]; u8 mic[8]; - uint frtype = GetFrameType(pframe); + uint frtype = get_frame_type(pframe); uint frsubtype = GetFrameSubType(pframe); frsubtype = frsubtype >> 4; @@ -1166,7 +1166,7 @@ static int aes_decipher(struct adapter *padapter, u8 *key, uint hdrlen, u8 mic[8]; /* uint offset = 0; */ - uint frtype = GetFrameType(pframe); + uint frtype = get_frame_type(pframe); uint frsubtype = GetFrameSubType(pframe); frsubtype = frsubtype >> 4; diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h index 1f65309aa1fe..bd22f74e425b 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -204,7 +204,7 @@ enum WIFI_REG_DOMAIN { #define get_order(pbuf) \ (((*(__le16 *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0) -#define GetFrameType(pbuf) \ +#define get_frame_type(pbuf) \ (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2))) #define SetFrameType(pbuf, type) \ @@ -361,7 +361,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) static inline int IsFrameTypeCtrl(unsigned char *pframe) { - if (WIFI_CTRL_TYPE == GetFrameType(pframe)) + if (WIFI_CTRL_TYPE == get_frame_type(pframe)) return true; else return false; -- 2.25.1