staging: r8188eu: refactor recvframe_defrag()
authorIvan Safonov <insafonov@gmail.com>
Wed, 20 Mar 2019 14:31:44 +0000 (17:31 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Mar 2019 07:25:01 +0000 (08:25 +0100)
Local variables pfhdr and prframe always have a same value,
so one of them is unnecessary.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_recv.c

index 606a9f51508a53922ce2ed6e159cec155dea49a5..1fac38cf0d0a13ab575cb73acc630a559fbc9f5f 100644 (file)
@@ -1325,7 +1325,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
        struct list_head *plist, *phead;
        u8 wlanhdr_offset;
        u8      curfragnum;
-       struct recv_frame *pfhdr, *pnfhdr;
+       struct recv_frame *pnfhdr;
        struct recv_frame *prframe, *pnextrframe;
        struct __queue *pfree_recv_queue;
 
@@ -1334,11 +1334,10 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
 
        phead = get_list_head(defrag_q);
        plist = phead->next;
-       pfhdr = list_entry(plist, struct recv_frame, list);
-       prframe = pfhdr;
+       prframe = list_entry(plist, struct recv_frame, list);
        list_del_init(&prframe->list);
 
-       if (curfragnum != pfhdr->attrib.frag_num) {
+       if (curfragnum != prframe->attrib.frag_num) {
                /* the first fragment number must be 0 */
                /* free the whole queue */
                rtw_free_recvframe(prframe, pfree_recv_queue);
@@ -1377,15 +1376,15 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
                skb_pull(pnextrframe->pkt, wlanhdr_offset);
 
                /* append  to first fragment frame's tail (if privacy frame, pull the ICV) */
-               skb_trim(prframe->pkt, prframe->pkt->len - pfhdr->attrib.icv_len);
+               skb_trim(prframe->pkt, prframe->pkt->len - prframe->attrib.icv_len);
 
                /* memcpy */
-               memcpy(skb_tail_pointer(pfhdr->pkt), pnfhdr->pkt->data,
+               memcpy(skb_tail_pointer(prframe->pkt), pnfhdr->pkt->data,
                       pnfhdr->pkt->len);
 
                skb_put(prframe->pkt, pnfhdr->pkt->len);
 
-               pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len;
+               prframe->attrib.icv_len = pnfhdr->attrib.icv_len;
                plist = plist->next;
        }