From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F2E6C38A2A for ; Fri, 8 May 2020 13:17:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2220E2496A for ; Fri, 8 May 2020 13:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588943874; bh=N1QuJS+d5gBmirzhOh9f5RZpo50hIk/wDqEPpv55E0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KwYs63j/KLYrI4F+lO/WJ8QcgPLKQRBLttA99uxsfwidG2hy+55oWml8j+R/jsa39 VOmufW7l1hegbkNek5I2ZhkC9xTrly00p1tteWZaP38pX+eOK9PWu0l4DbjP7T3yUH pBfN6BWVStp5D3/AazX4rdgvCZzl1GuN9+Zowpvs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728736AbgEHNRw (ORCPT ); Fri, 8 May 2020 09:17:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:41470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727953AbgEHMng (ORCPT ); Fri, 8 May 2020 08:43:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AF889206B8; Fri, 8 May 2020 12:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941815; bh=N1QuJS+d5gBmirzhOh9f5RZpo50hIk/wDqEPpv55E0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z6smHcF9DnBbz371xpwx0tvMdHkzO9UpbIqMKhlvLM9VRhlUh+59nZ56DCqqkXLYg vlYjAnf8XU1+DXDP035yxJA3vdvvoaaYDVkQ8RI4fCGftjGVLM5ydXusVjQJhH8+4V AXfYdGF7iuqp40qUSUE3TRYXaoNjbT6sO6K3N/k8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" Subject: [PATCH 4.4 182/312] qlcnic: use the correct ring in qlcnic_83xx_process_rcv_ring_diag() Date: Fri, 8 May 2020 14:32:53 +0200 Message-Id: <20200508123137.285319631@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 5b4d10f5e0369ed79434593b7cd8e85eebbe473f upstream. There is a static checker warning here "warn: mask and shift to zero" and the code sets "ring" to zero every time. From looking at how QLCNIC_FETCH_RING_ID() is used in qlcnic_83xx_process_rcv_ring() the qlcnic_83xx_hndl() should be removed. Fixes: 4be41e92f7c6 ('qlcnic: 83xx data path routines') Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c @@ -2220,7 +2220,7 @@ void qlcnic_83xx_process_rcv_ring_diag(s if (!opcode) return; - ring = QLCNIC_FETCH_RING_ID(qlcnic_83xx_hndl(sts_data[0])); + ring = QLCNIC_FETCH_RING_ID(sts_data[0]); qlcnic_83xx_process_rcv_diag(adapter, ring, sts_data); desc = &sds_ring->desc_head[consumer]; desc->status_desc_data[0] = cpu_to_le64(STATUS_OWNER_PHANTOM);