diff options
author | Martin Kaiser <martin@kaiser.cx> | 2023-01-23 21:53:35 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-27 10:10:36 +0100 |
commit | dfac03bde0bb7da07b52ade3a8743d52cb97bfa5 (patch) | |
tree | 57e45529a6358082ee766ba1c6ee47c8090f3384 /drivers/staging/r8188eu | |
parent | ca21b2db6804d2d1d03e376c8e1dc57b0875d38e (diff) | |
download | linux-stable-dfac03bde0bb7da07b52ade3a8743d52cb97bfa5.tar.gz linux-stable-dfac03bde0bb7da07b52ade3a8743d52cb97bfa5.tar.bz2 linux-stable-dfac03bde0bb7da07b52ade3a8743d52cb97bfa5.zip |
staging: r8188eu: use list_head for xmitframe list
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>
Diffstat (limited to 'drivers/staging/r8188eu')
-rw-r--r-- | drivers/staging/r8188eu/core/rtw_xmit.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 79a1999ca809..6060a1832431 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -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; } |