From patchwork Mon Feb 20 12:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 59419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1284556wrn; Mon, 20 Feb 2023 04:42:47 -0800 (PST) X-Google-Smtp-Source: AK7set8mt9nFzETToNwfDgrI2GRmw4r12ivvI8fPuYAdh5CnW/yh0d1n1d+G6mlnmSxKk2MsVAsX X-Received: by 2002:a17:902:c40b:b0:19a:964e:d6d2 with SMTP id k11-20020a170902c40b00b0019a964ed6d2mr838439plk.48.1676896967397; Mon, 20 Feb 2023 04:42:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676896967; cv=pass; d=google.com; s=arc-20160816; b=RKhhrc6yLKrzgB2LU0ePzVl1p3BbyNfFvqtjNC13iu+t2jfZVjCW8i+lKh0AIjUoNH IlNwgRwef6AJSySGBw+/6mFzn6h4iOMaczWt5Q8Ik/N0OHhazIVaFm0uM0pDy+/TJqE7 pBKlOLeVu3zSRWA/7zUMM+PcPXqoPnR9TPP24y4+nUNSpJLnVZF0YdHTeaSzW9ZQmDif sB9xFRfCYv6WFRwLhJ/RYW5TGBUBuv8J0NMnL84oGglCbN8Y226YrS5BQ2dDjodTEfVt PoYOO+HWLiDmXiEcEMPjWUDv3wUaH7FRle/uIB5aEOsPIUAdfc/Ng2QGwDBWJrsgz03K 5n+g== 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=P4ulBNbC+xUMiqkXZUQaW3mr3nHm+pzcba5ZADkMH18=; b=WRd1v4uAyJUvHmwMpAS7aH/vO9lm25O2qbMHECEQvGX1rlu3gENo+SLVphOGW5Bg5z CcJmfMKVgXhk5sEuxbRJKaV6WPG972nc6RFOf30WkjT1t6JQ2iEQQ32y5kizpIMrCgRG wqEPizf8vm3k0j7fkgm7v8WGy/Opxm1oLVi4gLFs890w6nsiZDG5SrXd2MLGu1olz/dc ULRZeWfYsIFbrBqyZm7w1ACh/Hup4N1g1z3yQTT2BTenv4O3rVSqnReqXLZB7KCpk9pb LbKrFp6e7QbgfSirFdOP1wDcBleM6Hnq1alFCk3rEQxSq2oOj6u/Fp//2cOwDNy26Tk2 d6Ng== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=QlkfB4B0; 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 e9-20020a17090301c900b00194967b7badsi10642695plh.591.2023.02.20.04.42.33; Mon, 20 Feb 2023 04:42:47 -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=QlkfB4B0; 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 S232096AbjBTMZv (ORCPT + 99 others); Mon, 20 Feb 2023 07:25:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232132AbjBTMZf (ORCPT ); Mon, 20 Feb 2023 07:25:35 -0500 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2071.outbound.protection.outlook.com [40.107.15.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58DE31C592; Mon, 20 Feb 2023 04:25:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U/EW7cZo+gn2Zrl/S4T1kRc2QnBcO9aUvpQ9Y7I9DyOwYRM3kw6/gHsj/eQAPmNNJ4fGnvyV/PR8g+AoFFbNv3R84N5GYDRQPc5jEWWyWwYtUkyUqnW8QnD3FiQB1Dvp+x3/SBcWc+ai88csFyJ5cYHtKheQi5cYKJ3yIzrh2N7cskhPQDcwjzVtoDsfpqa2wlFwdAABFxND8hOWgNFiIJPpmPZUI+VkiFmNErP8cOJw/LEVBe/SS0tBZs1HOG30Wo6WBdpWCSyX38LGohM+3bC+7iqKtT5/abUhuLRzwG4GypZbzfbiZonS4QT/1SQnLj9fVL1riKJ+OelNcXsH9w== 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=P4ulBNbC+xUMiqkXZUQaW3mr3nHm+pzcba5ZADkMH18=; b=cIV71Js0nDeGlbSkVEQmJJCEBG33goWuP4cctaYU6eUUqNGcQSAPPBvFod41CgbzWIGarccqnbl7/oTa61QTOUU38vls30KHkgvUCoLhZ/T6zW3TgsVHCEPrroD/vbUQmYZ3a9LY1fudWDPKxB5EgTi6kIQaGgyF0Qn9YPA0XDKBm55MMFYLC2R+KxmxlrzNJfNjwWkRfoOeWg/vWN7s5qSe1Pa/xgiuN5z2NNvyIXaUyGTr+L6gojGTLav8qAuzL9yggboV4psDYB1IMdJkjNnh0kOCaZeMTgf3r0yYzieA4QvP89pthZzvIiIVgQ+3WNWWICoJFFiwfzDF7Nq8zA== 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=P4ulBNbC+xUMiqkXZUQaW3mr3nHm+pzcba5ZADkMH18=; b=QlkfB4B0XwJXMiRMMR5OGhvAFvyoAKY8Wh8N+MCaLyPopKZ4whFxhYxiBDSHl2bL5iP1F458NelKKbUeBHGU2nCOP+x1gZ2moeHZ/OmLn7K0fK6SNv8EWcEPnDoS5N/eHlUER1csMqK6k0fRGqEbU6htbMX06LjnRRBRo5Lp2wo= 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 PA4PR04MB7725.eurprd04.prod.outlook.com (2603:10a6:102:f1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.19; Mon, 20 Feb 2023 12:24:17 +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.019; Mon, 20 Feb 2023 12:24:17 +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 , Giuseppe Cavallaro , Alexandre Torgue , Michael Sit Wei Hong , Mohammad Athari Bin Ismail , Jacob Keller , linux-kernel@vger.kernel.org, Ferenc Fejes Subject: [PATCH v3 net-next 09/13] net: enetc: rename "mqprio" to "qopt" Date: Mon, 20 Feb 2023 14:23:39 +0200 Message-Id: <20230220122343.1156614-10-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220122343.1156614-1-vladimir.oltean@nxp.com> References: <20230220122343.1156614-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: BE1P281CA0183.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:8d::17) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5136:EE_|PA4PR04MB7725:EE_ X-MS-Office365-Filtering-Correlation-Id: ddea0066-5d33-404c-7627-08db133d62c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +zuYMSARG4H9bcVtezGDToQRulaiZmjAUeIQt2/541/hHikMpeDWlfsBW462waR0XGL2HKj92vwg4RijRVt/SqY+MgG4nG9gziou32cWWzSOC96X6Thrcxiamzoq4uAsvrWXuKKfWt+wz4PQDuwWCFEhH90mVhvYMlJhaBZCIdwnnysLR8p0hcdmk8m2+c7/OjjsU/xNK1XfvlE2Dry5VT4raRHm6ur9M1HlVTwO1MiiuC/13BALboXqAgNnZSF/AV9w9ovD2FKE6frRp3J+kj6yfUhQE/E0hvIMWXxAvrSYodLnaW2ej1mvB9vEoUCeijQhqzFjIkrcb6QOAJWofLpPYAywR4EaWNDq5fgQ2S0IXka2UMJe7tFTNWJVWnbRYojivQlM57sHdC9/tS5htClKlFomFY5ve4xX9xiTlJEveW/QRfImc5Fc5hO1nlyDzAn9KpqJktMuEYG2dlbkEEHNj28e1fju/vmK6OFVtTAUeE1wTn2TGYEyR2EACRpGq1ij+DtZnnNHWO6c/A4M/+Ms91teNRwt8i5rdYC8eHRfwdc729tao2TNJID1HoDi6l1WJ7MK/Irvd3GPpKB8yHM8laytTv2PxfQYpg2aNnVLDhz5CIqzWdtHHTK3mxfT91VUwDUMvptVu/3xaUkIA1C1xgDw3y3hJdHqQFZajJXxDI/kGN20fKQMAH334F0hSXuEYkv9A/Id/c+9TMk1aQ== 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)(366004)(346002)(39860400002)(136003)(376002)(396003)(451199018)(8676002)(6916009)(4326008)(66556008)(316002)(6486002)(66476007)(54906003)(66946007)(7416002)(52116002)(8936002)(5660300002)(41300700001)(86362001)(36756003)(478600001)(38100700002)(1076003)(38350700002)(6506007)(26005)(186003)(6512007)(6666004)(2616005)(2906002)(44832011)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ib+P3AHHZCvhU+KQOmGiJWEZw4+2HeSPEkLSaR7hAJzBR6Ja4EnMpbiVJliBqRhItCijMA7aqx2P1JY6XW1UawicyKx5u9unfC4W6VBM1E93kBs96W+bWJae8LaXxUnvl6567uqmvTtzVyVIbJfj6eMzaU6xJOgsyOQPOgGG9EhqhLRhGJt/bEpHGaCEgHG5yiogvrk7pIl1zikldRVsmukUm/kuWTUGj58Kmn6JP2m6+g6lGj86VtPp4s40j7GOXKkVnXNyLwcq1j+WZXmxJs8XzDaFroXo4WOaWZKdaiV4LfR3Dxh5dgdIDJfTRpZSsyl48a1nHJDmifmqOTc1MnfG3UAugj0nTm2q8/AlR3D6if1K1KfGgI+3ptjg6r9Xh7XMGUKaCIVcjrUTwm1ytevALxsG726pYW+oEW0APYhaRwV/hZif8E0blLZkws7vPO125MC3TVITGTcyDthckgMSuUM96S8Rf0KsiWdEKqjSQsGjidyNtJzz8ifyMO8x+0PR0knSEe1j59mM0riALHrExlIj/F1r2xqGNxDHOj82MTZj+goy3yM5/xff9Bs0Xre5uvsL9Pr38Th321rZFrXbL2TXq+wfovfai8nFDaegD2xmGvN3fxzTVhzTVXZXrua0RZZIX9esdVOWZzCid7e+wJkvbmoQ/hF/kq+assHbtiH+7WdlJMXD5y+ZDj54oVPAHaoCuMZkWRHGkNKy0BVHMNwo6a8Al8sb7CQHX5qBzRVd7K09PseVtLL1ipfcsl9djEDY2GdMQEUTUBpki2j/GefCMYdxl2diVYdWqNoQlFj1IV8VuM64mcnszacyDtvPY+9zEUhWT0LBJER6H0oVq3PgHuUqnL9s0HNeIZVwasYizvC7lAkNrY6KnQ2p09mXxVC5fblLbFCU2qa7Kjw5CJrCwigdJn/VaPIcicZ4iavSQBNLnQVhYd+K/xIxPx4HJ+Vn56Va8MlhhA3EHTg2xoSLihWGUFYBlMU2ePZyynNRc1WlaFKO350+BcpkK3NuV3r6mqnRKEcaK3d8qD19fzHoRetdU2w8tIDdcLpmCUUof3iOuBffcSMI0uH61P7/c/kbTtHufTdr3EcrQjUPKasKlu9brMlURuZMh+Kbf2sbpRmM8eMTr/NEtpIEk46dYD7+g0ZAKKtFw9sE5dT4If/q/njmIhN8hSWOSOXrtp71bapHTbVI/1AdXh7p39/+FJPZa5b0p0KZA5UlbhkLN5eMsyokzt7IPY3nVA+buPhaC1OlIcHeuoQUCfttxj97W/pzOgRqMYVswlW2cNA4sVXbXOC1xSFIdT7GQK4PveqKatca+8FeGykyAlwkUWXWKUf5oL8knIenUCBNKUougi7BBOEJQO80CaMzvSWgnxcsMNUDPSMJ0tCCQsKdRduKRduVzwKNQBbxbTXvzDI4SaUbLHbC7crjxTYQ5BLdDGIomO1cDVcY+rxAwEKibcrs2D2r1Prt6Yomzl5vZ3pcmzEuskUgf4i3vrVh0/dqs+LnVbeD9f0N3aC5XqDrKWvidKGykW2afwvmZ2hBIWmwe17R5EpjpO/+a3dttyWTlJPQixDUYSRKbeJFHTu+g6ccXmjOeOQ0kcgLvqCY/w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddea0066-5d33-404c-7627-08db133d62c1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2023 12:24:17.5866 (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: RXCz2ivTRlIEi+4uecV9vPQ/pAvyHvkmYU5iqBUiYH4DpQNs6t6Gh2qWxPK4yeQGDS/BWcfnAM8ERZffFbUACw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7725 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_PASS,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?1758353914273824727?= X-GMAIL-MSGID: =?utf-8?q?1758353914273824727?= 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 Reviewed-by: Ferenc Fejes --- v1->v3: 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);