Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp3937390imm; Mon, 8 Oct 2018 12:00:03 -0700 (PDT) X-Google-Smtp-Source: ACcGV60GeQXCRJYgfB7/h+S4EmqVeY0i0d4uNPCYPEysx7un9ms9BupCWUOBo8z+7Y2ZqGW/3ugl X-Received: by 2002:a17:902:d01:: with SMTP id 1-v6mr25590418plu.88.1539025203927; Mon, 08 Oct 2018 12:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539025203; cv=none; d=google.com; s=arc-20160816; b=QnTmlHyVTMRkn0eqNVuRqJ3Q4ciELphD1RwdLpza86ZlcLLUR8qSTHg6+IIXevmtVc XjlQQQcU+fz2R7NGEd7QDWn2a41AF+VjlY2I5Hp+uKZJBYZcGmSSw8Y/tQYG4RQE/k+g V5Krj7emn1Vsd6TArq28ZHOWR1S5LnRwcEOpcCkYTqS1i5pgBb30Yl+FA4eONf0BWgBZ YhKQIVsc2z6KSPnqdZEdmVVRqVIcQ92tDesuE3Tq7Q0535djkvwO9LxUR7CC3VsocP6o KtDXIcIpdSFJfAoys+2C9TSL8TvVSRekP0T/pR0aCpdXomRR/GhwTCuBSdHCzD1uvcTU EOHQ== 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:dkim-signature; bh=z3mU5K3hoQaIH5BdJZAvSJFQzlXdMidOPq3r43gix60=; b=TNjKyr1MkabspyxWj80JjrfSJ22rlUlAnK5R/DvmgJfYY9hctgYW3AAglbU5mdk1+Y aLZYacIa0gFU9gk9/TSJwU+Y84yDVhZFN5w2wSvNwVnlq5rEbABdczses+1jvF4iMdOe BqlxZsk/l3HQlkbflt8sWz1mlx5WwrYaKCJfJ0AFjzz2nAgpsbdMYSoVQwRsfLj648KI 7479TX5wVKn/1l5pjY1OakfXK/FO8xlTXRmWLMdqNdXFK4KS+N5n2gDdYqsYxOqgA5/N UhmFU1LciNNBZFwzg+aVFU5nAL3Ichr4E2YceIiJO6YjbGhT3jk0uh8Z7leT2KPefAWF weZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MbL4LmG6; 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 b2-v6si16954617pgw.310.2018.10.08.11.59.49; Mon, 08 Oct 2018 12:00:03 -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; dkim=pass header.i=@kernel.org header.s=default header.b=MbL4LmG6; 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 S1731955AbeJICCz (ORCPT + 99 others); Mon, 8 Oct 2018 22:02:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:52276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730559AbeJICCx (ORCPT ); Mon, 8 Oct 2018 22:02:53 -0400 Received: from localhost (ip-213-127-77-176.ip.prioritytelecom.net [213.127.77.176]) (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 BE2CA204FD; Mon, 8 Oct 2018 18:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539024586; bh=YzCbdlM4Yo60Qll6wnJl9mha16RDeW9NZozhV0vmLzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MbL4LmG6Ri4kwqeL8EQ4DCjqX/4xxp3L/osF8anjTc30JzV63Ul5FHqETpXYFu63p mrHNd5hWWRgC1UTmWVctgT2a8MrgyqzMt3jk+Xyad64K7mSJciXWYBTp12G5s68+uE nzF5Jc8vaUN727WEyJ1ZzdOyqlT7brFHIUKbPwoo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ivan Mikhaylov , "David S. Miller" , Sasha Levin Subject: [PATCH 4.18 065/168] net/ibm/emac: wrong emac_calc_base call was used by typo Date: Mon, 8 Oct 2018 20:30:45 +0200 Message-Id: <20181008175622.519674208@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181008175620.043587728@linuxfoundation.org> References: <20181008175620.043587728@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: Ivan Mikhaylov [ Upstream commit bf68066fccb10fce6bbffdda24ee2ae314c9c5b2 ] __emac_calc_base_mr1 was used instead of __emac4_calc_base_mr1 by copy-paste mistake for emac4syn. Fixes: 45d6e545505fd32edb812f085be7de45b6a5c0af ("net/ibm/emac: add 8192 rx/tx fifo size") Signed-off-by: Ivan Mikhaylov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/emac/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -494,9 +494,6 @@ static u32 __emac_calc_base_mr1(struct e case 16384: ret |= EMAC_MR1_RFS_16K; break; - case 8192: - ret |= EMAC4_MR1_RFS_8K; - break; case 4096: ret |= EMAC_MR1_RFS_4K; break; @@ -537,6 +534,9 @@ static u32 __emac4_calc_base_mr1(struct case 16384: ret |= EMAC4_MR1_RFS_16K; break; + case 8192: + ret |= EMAC4_MR1_RFS_8K; + break; case 4096: ret |= EMAC4_MR1_RFS_4K; break;