From patchwork Sun Feb 19 13:52:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 59147 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp856467wrn; Sun, 19 Feb 2023 05:55:32 -0800 (PST) X-Google-Smtp-Source: AK7set80M2cSOQrOdCBJW/bSfCqWpQ955DezQBklbKaPKE1At9N++ykc3Lzo6NAo8O1Id0G6j4VX X-Received: by 2002:a05:6402:b3a:b0:4ad:7301:fe72 with SMTP id bo26-20020a0564020b3a00b004ad7301fe72mr2249264edb.8.1676814932617; Sun, 19 Feb 2023 05:55:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676814932; cv=pass; d=google.com; s=arc-20160816; b=u5iqPJCtFPj4t8zebQWLuIaOtcFY5nu1A7/ce33OWRNpKQ2swtEqvg4L2A3sTE5qMH SmTTlGwPNHLGlN9AcHJJGokk1c4DJ4tvc5DrZvmR+nn1A/gBTRgSlyaC1Kv4ZD8jHIfj ycqRYhSnFeUi1C+blDukF8LPO4XxjkVi1nD6JRE87IIM2SHmVSpN8ZUbv8V5OIFwD6Ov zH7uIoQObskOMyFaSUYcNBtca8CgIYtsu1AGkzECXfZmJegEV6plk2ZNRz3S95KV/5LP gs3PhzpccjnHx6v2nxuTXmPSyDyEV29/BAsaz7Y8w9D+hoJoFmEwbT5XzLeBbkgcxin6 Lanw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+40kMAraM7hDvsFJEK7pFjXpHKWGz2oct9yJ4VaKdBM=; b=CCaS/PmSp3qK9/tGkMz3sVZ8AqalCjgQHCEr1njzz/FTd0dj49krWygwSh3Cw4sEdE Kt2WcLFwbtpL0mUOyDKtjWR0I16StsLP29A3jgJ9pQpdykfEz9llS1028jSuiw4WSsaf sPtyKy+kOWwuYnCsf9icCGaekH0BHAKN/JZY3KcXF3LHtO5Gjfo+b5029ThIx94nOD0t WiCn4+18bo/Jvr5mKSoxE24afZV0YrDGgcxruivJeoePYBMXwYkCeZMVfwfj3vICp11p DFWmC1hvqwplrGvDatGy2J5tN1NzdXo/JgRaHd9SNnUnLR1IFsgmTWhKvqQFJNlhIQuK Cvfg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=AzwdEe4d; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n20-20020aa7d054000000b004ab0d0a4759si12498198edo.410.2023.02.19.05.55.09; Sun, 19 Feb 2023 05:55:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=AzwdEe4d; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230007AbjBSNxs (ORCPT + 99 others); Sun, 19 Feb 2023 08:53:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjBSNxn (ORCPT ); Sun, 19 Feb 2023 08:53:43 -0500 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2052.outbound.protection.outlook.com [40.107.104.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64BF74C0A; Sun, 19 Feb 2023 05:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U+gAmSEHOHxvgVNu24JaSocWEFFc4iPPBmrPM21/Gw1T1mThG3kD4/j1f2j1jrQ9ZRJlVyG4jofC0khv75idq0RFhdlYe4VXDogub3Z0Xlm3FkS9db6Fk4xnRB4BOklbm7ZXV82FOkcjVo/OqDskzbuHwbBff5r/kDj8r3S9EFNMNSFykKThSpbSjRsaNoyv7LMSrkR5dEZEaZViip6+sdd7ji/0PE7v2yFCJ0wv4uQbPmQl1zstzQvgikgO/wT0WQdTJMcoBpfP20WZ/QEyHlH82owo/AK5MjNFXVyhRS6Jg5Q/new4hFTXqVFwAHPJa4RuUE3Fi3b5P71tWLoSHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+40kMAraM7hDvsFJEK7pFjXpHKWGz2oct9yJ4VaKdBM=; b=cOfre2bIjfvqmdujD4wjBycpyHy4uNPXRENdKIecYnP+l6JgKTbRLFzdBZNhhGGLqkam3WX2L6G/c9FH6+UT01/41trFVgG10i9S565zUjBc6b05xo9FA9TDULR9S2oh864NL456kr9NYy11iCbOWIJLsq/14l7NORoptHaswWxvExzfwnhMe+tPb/f5nDWtuTtjtYZfFf5lY8hw5nCUEPgq8+QlzSq0xY65OpbitSRXdKLXT5xmaPl0U6a/g8Pr0pECUD4uBm7oDfy7+p+6Rl8u4icPQ5/goCmAdGZBYl974VCw7bTLJhCk3fd0cnxfNBx4uQMv9iW3chX4QDv81w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+40kMAraM7hDvsFJEK7pFjXpHKWGz2oct9yJ4VaKdBM=; b=AzwdEe4dFN7YWC1qGDnhGsXUvnv/i2M+zwgR6AZfXPKamMDw6LZVu0iXepDaVmRx+ZrxQzOlZic88jNYZrfyoakCy1A22tnS/AIQuGkN1hCNs/d1S3nViPcMI+XS/RO91wNMKS+DVBxptWprGdZKM2k1TwrHKgBGqDAgnuGJSa4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by PAXPR04MB8238.eurprd04.prod.outlook.com (2603:10a6:102:1bc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.17; Sun, 19 Feb 2023 13:53:39 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::3cfb:3ae7:1686:a68b]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::3cfb:3ae7:1686:a68b%7]) with mapi id 15.20.6111.018; Sun, 19 Feb 2023 13:53:39 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Vinicius Costa Gomes , Kurt Kanzenbach , Gerhard Engleder , Amritha Nambiar , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Ferenc Fejes , Xiaoliang Yang , Roger Quadros , Pranavi Somisetty , Harini Katakam , linux-kernel@vger.kernel.org, Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Wong Vee Khee , Michael Sit Wei Hong , Jacob Keller Subject: [PATCH v2 net-next 01/12] net: enetc: rename "mqprio" to "qopt" Date: Sun, 19 Feb 2023 15:52:57 +0200 Message-Id: <20230219135309.594188-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230219135309.594188-1-vladimir.oltean@nxp.com> References: <20230219135309.594188-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: BE1P281CA0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:7c::6) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5136:EE_|PAXPR04MB8238:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b81aa0f-6e52-40a6-6cb0-08db1280b3ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qlLF5w7BM2npg5gI4/ue+SieZsA+rablIAIFzNXEwtxeJYkP7VxS/mLs9wBLI3cw/YKsQ5C7y11qZMGp3ZqDaAAsb3//Ymet2oFcSoSg7+poXEv1GVBqmUhRB1NFJkSQ5UZVBxpgTv0BlUN5tUK6LyCHMQw6383XIknMH/1qJhq/7saOShLhwVOzPT3ws6rGnQBoucVFvEYb+/2SNCSPFQV+G0KL4a0MOK4smvF1qRl/Wd8/8ezLbvmI6CvEcPnUDJOvDedGsixAkCuzWLwsiRDP1U6NND9UzNTz5pipMupQ4TYzmbVj7snBI5sCcm9Bvh0p16UXIiQh+6iTnChUF++bW0v6aDNFL2NDaASXVaJm9RbeSu/UuB/2caQw+daoGFytraEHiZrzpgKjkis4SZXabbN6byDgOfep8MBMLUVdNTlS8qivqNYTODwgeFfK9zhtQkmyrAwVohGcNqGaEBq55TenQnHay02aW9HgYd1y/+NgK0vSPwZbO5IHA/Ti54+/YGp6bbGLptGExc+XW8TEjQ8vb1l0sbQD1hsX0aBZy7s8eZy5U989cPAJD6Xo2moAH08iYb02I7+DZ/o5cF4c5+QAAcFy+ruzLHKlNOjqOvTPCoEBcTyT9L6WcXKLEYPqaqOzNyqW9+YdnitMg6OY6S1Hnk5TNdzWA0yI57aC34D5TZTFYhdqTdhrQQKKkoKIX4Awzp1RCAzwBv/Pqw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5136.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(396003)(346002)(136003)(39860400002)(366004)(376002)(451199018)(8676002)(66556008)(66946007)(66476007)(5660300002)(7416002)(4326008)(8936002)(41300700001)(6916009)(44832011)(86362001)(38100700002)(38350700002)(6512007)(6666004)(6506007)(186003)(26005)(2616005)(83380400001)(52116002)(6486002)(478600001)(1076003)(36756003)(316002)(54906003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pp9KUcRMx8+wlPYBIF0jp3b6aXoSe+lTCZmE1n7CGxlXlZftig6ZLACTsGPJDGeiwgNN5d4LET2xMmxaKFzlGKNnBSncFo13SJTEfQ5IkKRvo6FyRCJ8ct5EOyeLwE22WAIAwJ4PmZLmLa9I/dvXyk1HKs6M4eNS7ajl7akFiIZCmvFtYPgqSvIW2vtF4RYIdMDhBUcpf7Db5TrNm1MSc4yldp4DLRLw3zciPp5tGkU0IbNaTEKTc+vIIYz9sDMOvy7DbQw/G4f4Pb7qz370RFv0H2Nd2HC3Es55OqgHq9bfQAp04MZinO6jFBpiMogR4riB418ieVrr/YwS2EEvUDPtmajyn4ElIIRr105C9uzInS7TF/ejp1ahzjZnct6HSoFxa4R2IDWkjkSzotga9QysVyo8Vj454UIu7DM5eiWxdug4n0oYj+6IK/eH+3rsjHlUqb7EtV86W7WB+vua5pXBSNrxUHj0bVWWOMSXWhSJZrIvsM9ZYHK4Syg3DKfkBVSiGTvFV1UJvw32hjKm4S7TYulc3eY8ciS5Yxzs35DQB1+Su/JdoONbyzVN4UiOOQqIoxnmaYNNbLMTOZSXNIVWuQVJIm65i99vRRCf/XQYxr8bQkEVZbngo/Yomob5VT8r0ncSPLncLQWj7rh09C1bHrV6GO2M9VItTU3gS9XtxJ4p/8Klhtxf44PhfC/p18ODL2O7tPErzjIvOtA/bovztkuynwRheyNKDBgIWSwowOXMbbJBzw8Jk6zkQGG1HQWqvuIr25ZY+0aBhCRRQjAFOH3T3qZ5jyCFdOk0I+5cxdNiyeq9GS4RU94Imz4J+57rK0TuOFyd3vkByk/YxQ7fdNeMDvZRQA/6eyj8b0HuJPpJ1CHmcKBswHd4t+B+tbgH2iv7TT3SkJtLv5osJz/K91qnvmR4KaF5NbCgNilFbZWqlL4x3MKIaq1nsXZVpWstVY/teHohDTc77ZQU0uf2LMvarMB3P/opkBe45AZfoaBurkNKZCKA1bta3JRGXJZCp8RBCvag8uynvOBjbByJGCLkomHE+/ruMNFp+DL3zK3VlnnZ19qTv5gAgkJelKPrfupBcdKBEM9bjRozPoEqoacvXThhTlbh6QTq5aSFuTwXguo8xSojYRcyhJgo2I2uCBKY9AiVTBQP37DatsMTtzjt8GnrGQt2R7UrKyHbg/09PfORPumyzjKkQPlBMN2RDXluGEPLXMgMIuLYTRFh8P7vtGcXAdv0XKIKPYKJ+2I6o9isUtFCWRxGQj6H2nOKB4fATNtxDNYpVwLbg4qKko+CEyig6qxJL1uZrE44BVmmAWcKRxmsyhBW0JYVZvi+raeUEHv/y4buS9W4SNfWzxuaL65cs8vOrftCnEMUjsZK0ZLga7+Gs8nhq0YU6VkzDb9i5J4Yh+BE1MtMApn4IMQ3x622qfGf3vZOa4Q2+G9I9u/V1D6KzGfL+iemVLRCdfa0QnpZEOU8Iq79sF1ssaNHCDMxqh7Hih6xnrAAU7R8El1A5SR01qIgdGDfF9dkd5T+zk2lfIUXLudY0vy7laKzpBdqmA2RlcrjiRMsiWpdhaUlEAjuiXBDJcLPSvhdXPYovCF4HQ839rf/ww== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b81aa0f-6e52-40a6-6cb0-08db1280b3ff X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2023 13:53:39.0375 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pTf5k4tIzu5m+DNbvVXLDfF/Gj/xeNHS+BtZBwHcIo9U80wK75YAYhVUTK7NmC6u+eJ8D96zDoJWCQCjPwyfvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8238 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758267894688250837?= X-GMAIL-MSGID: =?utf-8?q?1758267894688250837?= To gain access to the larger encapsulating structure which has the type tc_mqprio_qopt_offload, rename just the "qopt" field as "qopt". Signed-off-by: Vladimir Oltean --- v1->v2: none drivers/net/ethernet/freescale/enetc/enetc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 2fc712b24d12..e0207b01ddd6 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -2644,12 +2644,13 @@ static void enetc_reset_tc_mqprio(struct net_device *ndev) int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data) { + struct tc_mqprio_qopt_offload *mqprio = type_data; struct enetc_ndev_priv *priv = netdev_priv(ndev); - struct tc_mqprio_qopt *mqprio = type_data; + struct tc_mqprio_qopt *qopt = &mqprio->qopt; struct enetc_hw *hw = &priv->si->hw; int num_stack_tx_queues = 0; - u8 num_tc = mqprio->num_tc; struct enetc_bdr *tx_ring; + u8 num_tc = qopt->num_tc; int offset, count; int err, tc, q; @@ -2663,8 +2664,8 @@ int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data) return err; for (tc = 0; tc < num_tc; tc++) { - offset = mqprio->offset[tc]; - count = mqprio->count[tc]; + offset = qopt->offset[tc]; + count = qopt->count[tc]; num_stack_tx_queues += count; err = netdev_set_tc_queue(ndev, tc, count, offset);