drivers: net: xgene: Fix wrong logical operation
authorQuan Nguyen <qnguyen@apm.com>
Wed, 15 Mar 2017 20:27:17 +0000 (13:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Mar 2017 04:52:52 +0000 (21:52 -0700)
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>
drivers/net/ethernet/apm/xgene/xgene_enet_main.c

index b3568c453b1451f179a3c6ebe18ac524825840ac..ec43278d4b93bc0cfe55327614da6b54ed1656e8 100644 (file)
@@ -677,9 +677,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_free_pagepool(page_pool, raw_desc, exp_desc);
                xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),