lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 009/344] wil6210: fix break that is never reached because of zeroing of a retry counter
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 5b1413f00b5beb9f5fed94e43ea0c497d5db9633 ]

    There is a check on the retry counter invalid_buf_id_retry that is always
    false because invalid_buf_id_retry is initialized to zero on each iteration
    of a while-loop. Fix this by initializing the retry counter before the
    while-loop starts.

    Addresses-Coverity: ("Logically dead code")
    Fixes: b4a967b7d0f5 ("wil6210: reset buff id in status message after completion")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Reviewed-by: Maya Erez <merez@codeaurora.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c
    index 04d576deae72c..6cb0d7bcfe765 100644
    --- a/drivers/net/wireless/ath/wil6210/txrx_edma.c
    +++ b/drivers/net/wireless/ath/wil6210/txrx_edma.c
    @@ -880,6 +880,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil,
    u8 data_offset;
    struct wil_rx_status_extended *s;
    u16 sring_idx = sring - wil->srings;
    + int invalid_buff_id_retry;

    BUILD_BUG_ON(sizeof(struct wil_rx_status_extended) > sizeof(skb->cb));

    @@ -893,9 +894,9 @@ again:
    /* Extract the buffer ID from the status message */
    buff_id = le16_to_cpu(wil_rx_status_get_buff_id(msg));

    + invalid_buff_id_retry = 0;
    while (!buff_id) {
    struct wil_rx_status_extended *s;
    - int invalid_buff_id_retry = 0;

    wil_dbg_txrx(wil,
    "buff_id is not updated yet by HW, (swhead 0x%x)\n",
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-21 09:03    [W:6.639 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site