lkml.org 
[lkml]   [2022]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 044/106] staging: r8188eu: fix rtw_alloc_hwxmits error detection for now
    Date
    From: Phillip Potter <phil@philpotter.co.uk>

    [ Upstream commit 5b7419ae1d208cab1e2826d473d8dab045aa75c7 ]

    In _rtw_init_xmit_priv, we use the res variable to store the error
    return from the newly converted rtw_alloc_hwxmits function. Sadly, the
    calling function interprets res using _SUCCESS and _FAIL still, meaning
    we change the semantics of the variable, even in the success case.

    This leads to the following on boot:
    r8188eu 1-2:1.0: _rtw_init_xmit_priv failed

    In the long term, we should reverse these semantics, but for now, this
    fixes the driver. Also, inside rtw_alloc_hwxmits remove the if blocks,
    as HWXMIT_ENTRY is always 4.

    Fixes: f94b47c6bde6 ("staging: r8188eu: add check for kzalloc")
    Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
    Link: https://lore.kernel.org/r/20220521204741.921-1-phil@philpotter.co.uk
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/r8188eu/core/rtw_xmit.c | 20 +++++---------------
    1 file changed, 5 insertions(+), 15 deletions(-)

    diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
    index 0ee4f88a60d4..af13079a6d2c 100644
    --- a/drivers/staging/r8188eu/core/rtw_xmit.c
    +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
    @@ -179,8 +179,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)

    pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf;

    - res = rtw_alloc_hwxmits(padapter);
    - if (res) {
    + if (rtw_alloc_hwxmits(padapter)) {
    res = _FAIL;
    goto exit;
    }
    @@ -1534,19 +1533,10 @@ int rtw_alloc_hwxmits(struct adapter *padapter)

    hwxmits = pxmitpriv->hwxmits;

    - if (pxmitpriv->hwxmit_entry == 5) {
    - hwxmits[0] .sta_queue = &pxmitpriv->bm_pending;
    - hwxmits[1] .sta_queue = &pxmitpriv->vo_pending;
    - hwxmits[2] .sta_queue = &pxmitpriv->vi_pending;
    - hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
    - hwxmits[4] .sta_queue = &pxmitpriv->be_pending;
    - } else if (pxmitpriv->hwxmit_entry == 4) {
    - hwxmits[0] .sta_queue = &pxmitpriv->vo_pending;
    - hwxmits[1] .sta_queue = &pxmitpriv->vi_pending;
    - hwxmits[2] .sta_queue = &pxmitpriv->be_pending;
    - hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
    - } else {
    - }
    + hwxmits[0].sta_queue = &pxmitpriv->vo_pending;
    + hwxmits[1].sta_queue = &pxmitpriv->vi_pending;
    + hwxmits[2].sta_queue = &pxmitpriv->be_pending;
    + hwxmits[3].sta_queue = &pxmitpriv->bk_pending;

    return 0;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-20 15:52    [W:4.235 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site