{
        u8 update_mask = 0, wmmps_ac = 0;
        struct sta_info *psta_bmc;
-       struct list_head *xmitframe_plist, *xmitframe_phead;
-       struct xmit_frame *pxmitframe = NULL;
+       struct list_head *xmitframe_phead;
+       struct xmit_frame *pxmitframe, *n;
        struct sta_priv *pstapriv = &padapter->stapriv;
 
        spin_lock_bh(&psta->sleep_q.lock);
 
        xmitframe_phead = get_list_head(&psta->sleep_q);
-       list_for_each(xmitframe_plist, xmitframe_phead) {
-               pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
-                                       list);
-
+       list_for_each_entry_safe(pxmitframe, n, xmitframe_phead, list) {
                list_del_init(&pxmitframe->list);
 
                switch (pxmitframe->attrib.priority) {
                spin_lock_bh(&psta_bmc->sleep_q.lock);
 
                xmitframe_phead = get_list_head(&psta_bmc->sleep_q);
-               list_for_each(xmitframe_plist, xmitframe_phead) {
-                       pxmitframe = list_entry(xmitframe_plist,
-                                               struct xmit_frame, list);
-
+               list_for_each_entry_safe(pxmitframe, n, xmitframe_phead, list) {
                        list_del_init(&pxmitframe->list);
 
                        psta_bmc->sleepq_len--;