Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp1375394imm; Tue, 2 Oct 2018 07:17:08 -0700 (PDT) X-Google-Smtp-Source: ACcGV62VG0g7POBe1/UaskLoFyvDahCUtKu+TIi8BKGEd3ltcC5dbNjSmnMPHhFX4N3aFzUYjIAO X-Received: by 2002:a63:c5a:: with SMTP id 26-v6mr1606155pgm.372.1538489828142; Tue, 02 Oct 2018 07:17:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538489828; cv=none; d=google.com; s=arc-20160816; b=jyAf26jWlVaajbvLXg1vHHG0cqMNqbAS3W6skf1J4dEjUmIghzUVi7658YK1fdVj7g 8wWSzEsaDRRpfthKiPTDtxOa6f6M4MXROf14vMYaLnDmz5MDve2b+jlUYgXHM4wPqagG EWqOM0mnY4LtP4ozjMTMoeh8EPGeLeuUlCf81tr07yTWMAT2jLHdin9xEknp/iicHXgJ 83+ktwjjSeDBy/tfEp6Eg/BpD8LG8SxsQlzAKzwI065BQusby5MVnvhbnBtRLxlp9dP4 U/FO9ToxsxyKz8rAyK8/hpVaOQanPG37TdbHUzBqBr6dj6UL7ryOv55gzqa5WEWfXStn FlNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=evN2mZQDMNNNhvUS0Ku+65VS7Ua25xSdji5nnZBMeFc=; b=AEo95mF9adh6jHXBeiV5NfvzihC/9YXfefwxge4Lgn9632cu/tTXIzb48IX4XrfIKN HV7bbGxUb+4YyDejSUVpMhlvZjjyVhvaY0XbOSMyi/XJJNnMYDr9GEp/4le4EJip1+Yx 7zkYF0vMdtr9X6UcBj3teCHz85/fVypkrdoL14TypG/dA2IFkrO5ojGzvp/KxrnmeU3d G1ku8Cw9vxFRBnH42ofXwk4msvZ/SI1Fpt3Sd09s4wjWFUurenE5P5qVRhFFSLlswnVa T7OD5CPAFmzc0HUq99t+j4hesq9+hariz6+JOZMaX7Si14sc48ZCrt9CxNVN85JKbEDb LaUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s195-v6si15191665pgs.492.2018.10.02.07.16.53; Tue, 02 Oct 2018 07:17:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727781AbeJBUKK (ORCPT + 99 others); Tue, 2 Oct 2018 16:10:10 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59966 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727758AbeJBUKK (ORCPT ); Tue, 2 Oct 2018 16:10:10 -0400 Received: from localhost (24-104-73-23-ip-static.hfc.comcastbusiness.net [24.104.73.23]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3CF6FB2F; Tue, 2 Oct 2018 13:26:49 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ganesh Goudar , "David S. Miller" , Sasha Levin Subject: [PATCH 4.18 028/228] cxgb4: Fix the condition to check if the card is T5 Date: Tue, 2 Oct 2018 06:22:05 -0700 Message-Id: <20181002132500.980979270@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132459.032960735@linuxfoundation.org> References: <20181002132459.032960735@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ganesh Goudar [ Upstream commit dfecc759e64b0ea581468fe2359836f1998deac9 ] Use 'chip_ver' rather than 'chip' to check if the card is T5. Fixes: e8d452923ae6 ("cxgb4: clean up init_one") Signed-off-by: Ganesh Goudar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5705,7 +5705,7 @@ static int init_one(struct pci_dev *pdev if (t4_read_reg(adapter, LE_DB_CONFIG_A) & HASHEN_F) { u32 hash_base, hash_reg; - if (chip <= CHELSIO_T5) { + if (chip_ver <= CHELSIO_T5) { hash_reg = LE_DB_TID_HASHBASE_A; hash_base = t4_read_reg(adapter, hash_reg); adapter->tids.hash_base = hash_base / 4;