staging: r8188eu: change function param from __queue to list_head
authorMartin Kaiser <martin@kaiser.cx>
Mon, 30 Jan 2023 19:52:56 +0000 (20:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Jan 2023 10:16:56 +0000 (11:16 +0100)
Modify the dequeue_xmitframes_to_sleeping_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.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20230130195303.138941-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_xmit.c

index 4e49f1d49eb55463ecbff0ec8e838683311ffb5a..3117db41d749059710aea15d8993a5b1602fae24 100644 (file)
@@ -1788,16 +1788,15 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
        return ret;
 }
 
-static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
+static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct list_head *phead)
 {
-       struct list_head *plist, *phead;
+       struct list_head *plist;
        u8      ac_index;
        struct tx_servq *ptxservq;
        struct pkt_attrib       *pattrib;
        struct xmit_frame       *pxmitframe;
        struct hw_xmit *phwxmits =  padapter->xmitpriv.hwxmits;
 
-       phead = get_list_head(pframequeue);
        plist = phead->next;
 
        while (phead != plist) {
@@ -1834,21 +1833,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, &pstaxmitpriv->vo_q.sta_pending);
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->vo_q.sta_pending));
        list_del_init(&pstaxmitpriv->vo_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.sta_pending);
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->vi_q.sta_pending));
        list_del_init(&pstaxmitpriv->vi_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.sta_pending);
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstaxmitpriv->be_q.sta_pending));
        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
-       dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.sta_pending);
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&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, &pstaxmitpriv->be_q.sta_pending);
+       dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, get_list_head(&pstaxmitpriv->be_q.sta_pending));
        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
        spin_unlock_bh(&pxmitpriv->lock);