mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

staging: r8188eu: use list_head for xmitframe list

Browse source 
The r8188eu driver defines a struct __queue that contains a list_head and
a spinlock.

struct tx_servq describes a station for which we have pending tx packets.
This struct contains a __queue for the pending packets (a __queue of
struct xmit_frame entries). In this particular case, the queue's spinlock
is not used, we need only the list_head.

rtw_dequeue_xframe uses a local variable for such an xmit_frame queue.
This patch replaces this variable with a list_head.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230123205342.229589-17-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2023-01-23 21:53:35 +01:00 committed by Greg Kroah-Hartman
parent ca21b2db68
commit dfac03bde0
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/r8188eu/core/rtw_xmit.c
View file

@ -1355,15 +1355,14 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
return _SUCCESS;
}
static struct xmit_frame *dequeue_one_xmitframe(struct __queue *pframe_queue)
static struct xmit_frame *dequeue_one_xmitframe(struct list_head *xframe_list)
{
struct list_head *xmitframe_phead = get_list_head(pframe_queue);
struct xmit_frame *pxmitframe;
if (list_empty(xmitframe_phead))
if (list_empty(xframe_list))
return NULL;
pxmitframe = container_of(xmitframe_phead->next, struct xmit_frame, list);
pxmitframe = container_of(xframe_list->next, struct xmit_frame, list);
list_del_init(&pxmitframe->list);
return pxmitframe;
}
@ -1373,7 +1372,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct list_head *sta_phead;
struct hw_xmit *phwxmit;
struct tx_servq *ptxservq, *tmp_txservq;
struct __queue *pframe_queue = NULL;
struct list_head *xframe_list;
struct xmit_frame *pxmitframe = NULL;
struct adapter *padapter = pxmitpriv->adapter;
struct registry_priv *pregpriv = &padapter->registrypriv;
@ -1393,16 +1392,15 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
list_for_each_entry_safe(ptxservq, tmp_txservq, sta_phead, tx_pending) {
pframe_queue = &ptxservq->sta_pending;
pxmitframe = dequeue_one_xmitframe(pframe_queue);
xframe_list = get_list_head(&ptxservq->sta_pending);
pxmitframe = dequeue_one_xmitframe(xframe_list);
if (pxmitframe) {
phwxmit->accnt--;
ptxservq->qcnt--;
/* Remove sta node when there are no pending packets. */
if (list_empty(&pframe_queue->queue))
if (list_empty(xframe_list))
list_del_init(&ptxservq->tx_pending);
goto exit;
}