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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 EF412C56201 for ; Tue, 24 Nov 2020 22:39:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 917A82086A for ; Tue, 24 Nov 2020 22:39:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="DN49BvJO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389927AbgKXWim (ORCPT ); Tue, 24 Nov 2020 17:38:42 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:4686 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731770AbgKXWil (ORCPT ); Tue, 24 Nov 2020 17:38:41 -0500 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0AOMc5xj016952; Tue, 24 Nov 2020 23:38:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=STMicroelectronics; bh=MxQtwOp9fgA7AhJtkyo2khTdblmvpYD9H570y7mgSJE=; b=DN49BvJO4Q/LTGaR3sKWMRspPKtFDxS/edBiVz8mxffgCg1VOFi6v/icexlPAcNHmvJR u5HmamPu/Vp8CisqeSVc0DdGZlweeoVte90RknkUPgg9CW8T88unxs231ZmLxTmlT64w 0v5CPTGvTyCR7sQ5ygY4FYisxUQ2WMJCW0wqsrXqQZg63d9yKV319GszZF/Ot8dGTMcF sPPl70fP/XuF02qkmNXoO165vzcVf+8GaA/v2aHa6ZBSU2oKhscu/ScTT5hb1s0vS/2P r9QHQmM8yO4ZGeL90+DuSzx7UKS1eQarBJ4nod/5u67TMIMxPP9X1myxns2fkaNQ8bru Yg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 34y0hjc2vh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Nov 2020 23:38:22 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1643210002A; Tue, 24 Nov 2020 23:38:22 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag1node3.st.com [10.75.127.3]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id F0BCD20755B; Tue, 24 Nov 2020 23:38:21 +0100 (CET) Received: from localhost (10.75.127.48) by SFHDAG1NODE3.st.com (10.75.127.3) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 24 Nov 2020 23:38:21 +0100 From: Antonio Borneo To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski CC: Antonio Borneo , , Ahmad Fatoum , Maxime Coquelin , , , , Subject: [PATCH] net: stmmac: fix incorrect merge of patch upstream Date: Tue, 24 Nov 2020 23:37:29 +0100 Message-ID: <20201124223729.886992-1-antonio.borneo@st.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> References: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SFHDAG1NODE3.st.com (10.75.127.3) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-24_10:2020-11-24,2020-11-24 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a") was intended to modify the struct dwmac410_ops, but it got somehow badly merged and modified the struct dwmac4_ops. Revert the modification in struct dwmac4_ops and re-apply it properly in struct dwmac410_ops. Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a") Cc: stable@vger.kernel.org # v5.6+ Signed-off-by: Antonio Borneo Reported-by: Ahmad Fatoum --- To: Alexandre Torgue To: Jose Abreu To: "David S. Miller" To: Jakub Kicinski Cc: Maxime Coquelin Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 002791b77356..ced6d76a0d85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, - .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, @@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, + .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, base-commit: 9bd2702d292cb7b565b09e949d30288ab7a26d51 -- 2.29.2