lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 360/757] staging: rtl8712: Fix enqueue_reorder_recvframe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 29838144f280fc03ca06a621568f34e1d0a65a4f ]

    The logic of this function was accidentally broken by a checkpatch
    inspired cleanup. I've modified the code to restore the original
    behavior and also make checkpatch happy.

    Fixes: 98fe05e21a6e ("staging: rtl8712: Remove unnecesary else after return statement.")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/20200929103548.GA493135@mwanda
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8712/rtl8712_recv.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
    index d83f421acfc1e..a397dc6231f13 100644
    --- a/drivers/staging/rtl8712/rtl8712_recv.c
    +++ b/drivers/staging/rtl8712/rtl8712_recv.c
    @@ -477,11 +477,14 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,
    while (!end_of_queue_search(phead, plist)) {
    pnextrframe = container_of(plist, union recv_frame, u.list);
    pnextattrib = &pnextrframe->u.hdr.attrib;
    +
    + if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
    + return false;
    +
    if (SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
    plist = plist->next;
    - else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
    - return false;
    - break;
    + else
    + break;
    }
    list_del_init(&(prframe->u.hdr.list));
    list_add_tail(&(prframe->u.hdr.list), plist);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:4.077 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site