Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11623fce authored by Quan Nguyen's avatar Quan Nguyen Committed by David S. Miller
Browse files

drivers: net: xgene: Fix wrong logical operation 



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

Fixes: 3bb502f8 ("drivers: net: xgene: fix statistics counters race condition")
Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarQuan Nguyen <qnguyen@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e026e700

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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),