From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 11/19] staging: r8188eu: rename _rtw_pktfile_read()
Date: Sat, 20 Aug 2022 20:16:15 +0200 [thread overview]
Message-ID: <20220820181623.12497-12-straube.linux@gmail.com> (raw)
In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com>
There is no need to prefix the function name of _rtw_pktfile_read()
with an underscore. Rename it to rtw_pktfile_read().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_xmit.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 26bf300e672b..51672984156b 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -427,7 +427,7 @@ static uint rtw_remainder_len(struct pkt_file *pfile)
(size_t)(pfile->buf_start));
}
-static uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)
+static uint rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)
{
uint len = 0;
@@ -450,11 +450,11 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
s32 user_prio = 0;
rtw_open_pktfile(ppktfile->pkt, ppktfile);
- _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN);
+ rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN);
/* get user_prio from IP hdr */
if (pattrib->ether_type == 0x0800) {
- _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr));
+ rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr));
/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */
user_prio = ip_hdr.tos >> 5;
} else if (pattrib->ether_type == 0x888e) {
@@ -484,7 +484,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
rtw_open_pktfile(pkt, &pktfile);
- _rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN);
+ rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN);
pattrib->ether_type = ntohs(etherhdr.h_proto);
@@ -512,7 +512,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
/* to prevent DHCP protocol fail */
u8 tmp[24];
- _rtw_pktfile_read(&pktfile, &tmp[0], 24);
+ rtw_pktfile_read(&pktfile, &tmp[0], 24);
pattrib->dhcp_pkt = 0;
if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */
if (((tmp[21] == 68) && (tmp[23] == 67)) ||
@@ -963,7 +963,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
}
rtw_open_pktfile(pkt, &pktfile);
- _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen);
+ rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen);
frg_inx = 0;
frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */
@@ -1021,9 +1021,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
if (bmcst) {
/* don't do fragment to broadcast/multicast packets */
- mem_sz = _rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen);
+ mem_sz = rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen);
} else {
- mem_sz = _rtw_pktfile_read(&pktfile, pframe, mpdu_len);
+ mem_sz = rtw_pktfile_read(&pktfile, pframe, mpdu_len);
}
pframe += mem_sz;
--
2.37.2
next prev parent reply other threads:[~2022-08-20 18:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-20 18:16 [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 01/19] staging: r8188eu: make rtw_remainder_len() static Michael Straube
2022-08-21 19:57 ` Philipp Hortmann
2022-08-21 20:42 ` Michael Straube
2022-08-20 18:16 ` [PATCH 02/19] staging: r8188eu: make rtw_os_xmit_schedule() static Michael Straube
2022-08-20 18:16 ` [PATCH 03/19] staging: r8188eu: rename rtw_os_xmit_schedule() Michael Straube
2022-08-20 18:16 ` [PATCH 04/19] staging: r8188eu: make rtw_os_xmit_resource_alloc() static Michael Straube
2022-08-20 18:16 ` [PATCH 05/19] staging: r8188eu: rename rtw_os_xmit_resource_alloc() Michael Straube
2022-08-20 18:16 ` [PATCH 06/19] staging: r8188eu: make rtw_os_xmit_resource_free() static Michael Straube
2022-08-20 18:16 ` [PATCH 07/19] staging: r8188eu: rename rtw_os_xmit_resource_free() Michael Straube
2022-08-20 18:16 ` [PATCH 08/19] staging: r8188eu: make _rtw_open_pktfile() static Michael Straube
2022-08-20 18:16 ` [PATCH 09/19] staging: r8188eu: rename _rtw_open_pktfile() Michael Straube
2022-08-20 18:16 ` [PATCH 10/19] staging: r8188eu: make _rtw_pktfile_read() static Michael Straube
2022-08-20 18:16 ` Michael Straube [this message]
2022-08-20 18:16 ` [PATCH 12/19] staging: r8188eu: remove unnecessary initialization to zero Michael Straube
2022-08-20 18:16 ` [PATCH 13/19] staging: r8188eu: move struct pkt_file to rtw_xmit.h Michael Straube
2022-08-20 18:16 ` [PATCH 14/19] staging: r8188eu: move rtw_os_xmit_complete() to rtw_xmit.c Michael Straube
2022-08-20 18:16 ` [PATCH 15/19] staging: r8188eu: rename rtw_os_xmit_complete() Michael Straube
2022-08-20 18:16 ` [PATCH 16/19] staging: r8188eu: make rtw_os_pkt_complete() static Michael Straube
2022-08-20 18:16 ` [PATCH 17/19] staging: r8188eu: rename rtw_os_pkt_complete() Michael Straube
2022-08-20 18:16 ` [PATCH 18/19] staging: r8188eu: remove os_dep/xmit_linux.c Michael Straube
2022-08-20 18:16 ` [PATCH 19/19] staging: r8188eu: remove xmit_osdep.h Michael Straube
2022-08-22 17:58 ` [PATCH 00/19] staging: r8188eu: migrate os_dep/xmit_linux.c Philipp Hortmann
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=20220820181623.12497-12-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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