staging: r8188eu: make sta_pending a list_head

We can now change sta_pending in struct tx_servq from __queue to
list_head. The driver defines __queue as list_head + spinlock, the
spinlock is not used for sta_pending.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20230130195303.138941-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index 49a9272..a9c29b2 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -263,19 +263,19 @@ void rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
        rtw_free_xmitframe_list(pxmitpriv, get_list_head(&psta->sleep_q));
        psta->sleepq_len = 0;
 
-       rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vo_q.sta_pending));
+       rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->vo_q.sta_pending);
 
        list_del_init(&pstaxmitpriv->vo_q.tx_pending);
 
-       rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vi_q.sta_pending));
+       rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->vi_q.sta_pending);
 
        list_del_init(&pstaxmitpriv->vi_q.tx_pending);
 
-       rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->bk_q.sta_pending));
+       rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->bk_q.sta_pending);
 
        list_del_init(&pstaxmitpriv->bk_q.tx_pending);
 
-       rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->be_q.sta_pending));
+       rtw_free_xmitframe_list(pxmitpriv, &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 d272166..24cf11e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -17,7 +17,7 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
 static void _init_txservq(struct tx_servq *ptxservq)
 {
        INIT_LIST_HEAD(&ptxservq->tx_pending);
-       rtw_init_queue(&ptxservq->sta_pending);
+       INIT_LIST_HEAD(&ptxservq->sta_pending);
        ptxservq->qcnt = 0;
 }
 
@@ -1361,7 +1361,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
        for (i = 0; i < HWXMIT_ENTRY; i++) {
                phwxmit = phwxmit_i + inx[i];
                list_for_each_entry_safe(ptxservq, tmp_txservq, phwxmit->sta_list, tx_pending) {
-                       xframe_list = get_list_head(&ptxservq->sta_pending);
+                       xframe_list = &ptxservq->sta_pending;
                        if (list_empty(xframe_list))
                                continue;
 
@@ -1444,7 +1444,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
        if (list_empty(&ptxservq->tx_pending))
                list_add_tail(&ptxservq->tx_pending, phwxmits[ac_index].sta_list);
 
-       list_add_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending));
+       list_add_tail(&pxmitframe->list, &ptxservq->sta_pending);
        ptxservq->qcnt++;
        phwxmits[ac_index].accnt++;
 exit:
@@ -1832,21 +1832,21 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
 
        pstapriv->sta_dz_bitmap |= BIT(psta->aid);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->vo_q.sta_pending));
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.sta_pending);
        list_del_init(&pstaxmitpriv->vo_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->vi_q.sta_pending));
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.sta_pending);
        list_del_init(&pstaxmitpriv->vi_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->be_q.sta_pending));
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.sta_pending);
        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->bk_q.sta_pending));
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.sta_pending);
        list_del_init(&pstaxmitpriv->bk_q.tx_pending);
 
        /* for BC/MC Frames */
        pstaxmitpriv = &psta_bmc->sta_xmitpriv;
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, get_list_head(&pstaxmitpriv->be_q.sta_pending));
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending);
        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
        spin_unlock_bh(&pxmitpriv->lock);

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 1855773..5aa33fc 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -461,7 +461,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt)
        }
        spin_lock_bh(&pxmitpriv->lock);
 
-       xmitframe_phead = get_list_head(&ptxservq->sta_pending);
+       xmitframe_phead = &ptxservq->sta_pending;
        xmitframe_plist = xmitframe_phead->next;
 
        while (xmitframe_phead != xmitframe_plist) {
@@ -512,7 +512,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt)
                }
        } /* end while (aggregate same priority and same DA(AP or STA) frames) */
 
-       if (list_empty(&ptxservq->sta_pending.queue))
+       if (list_empty(&ptxservq->sta_pending))
                list_del_init(&ptxservq->tx_pending);
 
        spin_unlock_bh(&pxmitpriv->lock);

diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index 8557b31..dfdc1c5 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -221,7 +221,7 @@ struct xmit_frame {
 
 struct tx_servq {
        struct list_head tx_pending;
-       struct __queue sta_pending;
+       struct list_head sta_pending;
        int qcnt;
 };