lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 032/219] drivers: net: xgene: Fix wrong logical operation
    Date
    From: Quan Nguyen <qnguyen@apm.com>

    [ Upstream commit 11623fce0f9afef30c45e3f2120b063de3809a8f ]

    This patch fixes the wrong logical OR operation by changing it to
    bit-wise OR operation.

    Fixes: 3bb502f83080 ("drivers: net: xgene: fix statistics counters race condition")
    Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
    Signed-off-by: Quan Nguyen <qnguyen@apm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
    index 8158d4698734..de1546a63a7f 100644
    --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
    +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
    @@ -537,9 +537,9 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
    buf_pool->rx_skb[skb_index] = NULL;

    /* checking for error */
    - status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) ||
    + status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) |
    GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
    - if (unlikely(status > 2)) {
    + if (unlikely(status)) {
    dev_kfree_skb_any(skb);
    xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),
    status);
    --
    2.14.1
    \
     
     \ /
      Last update: 2022-09-17 16:04    [W:4.033 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site