From patchwork Wed Mar 15 20:27:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 739427 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vk3653ZQtz9ryk for ; Thu, 16 Mar 2017 07:26:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b="kEjiqc9b"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753867AbdCOU0V (ORCPT ); Wed, 15 Mar 2017 16:26:21 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:33304 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbdCOU0S (ORCPT ); Wed, 15 Mar 2017 16:26:18 -0400 Received: by mail-pf0-f169.google.com with SMTP id w189so13701681pfb.0 for ; Wed, 15 Mar 2017 13:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1FP7a2E3NJyJ+4MjZDTSS9uBl6us0smN1v7J7ZZ8S6I=; b=kEjiqc9bhO3nVn6yCny6j4hsI7RJOOFhB2K0tfSI+xazGCsjwfXeh4jPFIictUVWP2 YYf2SgyFWQM9SJZDSc46J2WebMtajUjnm1QDEcxGC0mp5cDMl88WlgKkWKrGgberZlEr E2PVFPbLMouLta4T2vmUf8uqU520LT93hDp3U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1FP7a2E3NJyJ+4MjZDTSS9uBl6us0smN1v7J7ZZ8S6I=; b=oZfzdJ6LYzmGdYMGv+Z30jsAUbqoSYwiabOkO1MQJgVa+2E1YHLWv0ogMSsR4ZOPSX yHsTubeHMv8GMnRVCDXPKtRe8POVWOXlXwY/erMzpAlDia1hBeOdtv6yCwCzbSUeCpGd gcCEYmDqTrQ3+JNx98tjXVwm8PIrjagVkgEpjxVUYD608I7PiD2cIvLahDG8q3OatEmb n8M6v5gz8cyb3IEeocgdjY8t94oMmdz/eONUmX860SnfOtk/6cr65hBzhGtVq5kUw7uI 2nJPYaHUJXipGVmCDAZhtgcpGNDudnrbtfYCaCnjMEK578KRc0IFD9cE4T1lMTDTI9ZW JJZg== X-Gm-Message-State: AFeK/H2F8ICd8pcMCb0nTKe1GgtAk/JPxYN9MstewBCcRj109wGd45tnAJtohnYUbUCKRn9s X-Received: by 10.98.111.129 with SMTP id k123mr5890445pfc.18.1489609567550; Wed, 15 Mar 2017 13:26:07 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id r67sm5922281pfb.125.2017.03.15.13.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Mar 2017 13:26:06 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@apm.com, kchudgar@apm.com, qnguyen@apm.com, Iyappan Subramanian Subject: [PATCH net-next 3/7] drivers: net: xgene: Fix wrong logical operation Date: Wed, 15 Mar 2017 13:27:17 -0700 Message-Id: <1489609641-31557-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489609641-31557-1-git-send-email-isubramanian@apm.com> References: <1489609641-31557-1-git-send-email-isubramanian@apm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quan Nguyen 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 Signed-off-by: Quan Nguyen --- 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 b3568c4..ec43278 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -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),