From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 3/9] staging: r8188eu: change another function param from __queue to list_head
Date: Mon, 30 Jan 2023 20:52:57 +0100 [thread overview]
Message-ID: <20230130195303.138941-4-martin@kaiser.cx> (raw)
In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx>
Modify the rtw_free_xmitframe_queue function to take a list_head pointer
instead of a __queue pointer.
This is an intermediate step towards changing struct tx_servq's
sta_pending from __queue to list_head.
Now that the function takes a list instead of a queue, we should also
rename it to rtw_free_xmitframe_list.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 10 +++++-----
drivers/staging/r8188eu/core/rtw_xmit.c | 9 ++++-----
drivers/staging/r8188eu/include/rtw_xmit.h | 3 +--
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index b4aee8623099..49a92725c5ed 100644
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -260,22 +260,22 @@ void rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
spin_lock_bh(&pxmitpriv->lock);
- rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q);
+ rtw_free_xmitframe_list(pxmitpriv, get_list_head(&psta->sleep_q));
psta->sleepq_len = 0;
- rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->vo_q.sta_pending);
+ rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vo_q.sta_pending));
list_del_init(&pstaxmitpriv->vo_q.tx_pending);
- rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->vi_q.sta_pending);
+ rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vi_q.sta_pending));
list_del_init(&pstaxmitpriv->vi_q.tx_pending);
- rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->bk_q.sta_pending);
+ rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->bk_q.sta_pending));
list_del_init(&pstaxmitpriv->bk_q.tx_pending);
- rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->be_q.sta_pending);
+ rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->be_q.sta_pending));
list_del_init(&pstaxmitpriv->be_q.tx_pending);
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 3117db41d749..d272166a99ec 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -1325,15 +1325,14 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
return _SUCCESS;
}
-void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue)
+void rtw_free_xmitframe_list(struct xmit_priv *pxmitpriv, struct list_head *xframe_list)
{
- struct list_head *plist, *phead;
+ struct list_head *plist;
struct xmit_frame *pxmitframe;
- phead = get_list_head(pframequeue);
- plist = phead->next;
+ plist = xframe_list->next;
- while (phead != plist) {
+ while (xframe_list != plist) {
pxmitframe = container_of(plist, struct xmit_frame, list);
plist = plist->next;
diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index d8808e68f778..8557b311e809 100644
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -309,8 +309,7 @@ s32 rtw_put_snap(u8 *data, u16 h_proto);
struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv);
s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv,
struct xmit_frame *pxmitframe);
-void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv,
- struct __queue *pframequeue);
+void rtw_free_xmitframe_list(struct xmit_priv *pxmitpriv, struct list_head *xframe_list);
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter,
struct sta_info *psta, int up, u8 *ac);
struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv,
--
2.30.2
next prev parent reply other threads:[~2023-01-30 19:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 19:52 [PATCH 0/9] staging: r8188eu: another round of xmit cleanups Martin Kaiser
2023-01-30 19:52 ` [PATCH 1/9] staging: r8188eu: rtw_free_xmitframe_queue needs no spinlock Martin Kaiser
2023-01-30 19:52 ` [PATCH 2/9] staging: r8188eu: change function param from __queue to list_head Martin Kaiser
2023-01-30 19:52 ` Martin Kaiser [this message]
2023-01-30 19:52 ` [PATCH 4/9] staging: r8188eu: make sta_pending a list_head Martin Kaiser
2023-01-30 19:52 ` [PATCH 5/9] staging: r8188eu: use kernel helper to iterate over a list Martin Kaiser
2023-01-30 19:53 ` [PATCH 6/9] staging: r8188eu: legacy_dz is initialised but never used Martin Kaiser
2023-01-30 19:53 ` [PATCH 7/9] staging: r8188eu: apsd " Martin Kaiser
2023-01-30 19:53 ` [PATCH 8/9] staging: r8188eu: option in struct sta_xmit_priv is not used Martin Kaiser
2023-01-30 19:53 ` [PATCH 9/9] staging: r8188eu: replace switch-case with if Martin Kaiser
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=20230130195303.138941-4-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@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®