diff options
| author | Ivan Safonov <insafonov@gmail.com> | 2019-03-20 17:31:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-21 08:25:01 +0100 |
| commit | 19c74ea57715c09c63eb7ddeadab84503f9fed9f (patch) | |
| tree | f2f95b134aa9e80e21fdb5fb6c2a1f6f7a1172fe /drivers/staging/rtl8188eu | |
| parent | 737e061563b0580f3c74d4c08cbc7f5ab64a77b1 (diff) | |
staging: r8188eu: refactor recvframe_defrag()
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>
Diffstat (limited to 'drivers/staging/rtl8188eu')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_recv.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c index 606a9f51508a..1fac38cf0d0a 100644 --- a/drivers/staging/rtl8188eu/core/rtw_recv.c +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c @@ -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; } |