From patchwork Mon Apr 3 10:34: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: 13198002 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F042C76196 for ; Mon, 3 Apr 2023 10:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231982AbjDCKhg (ORCPT ); Mon, 3 Apr 2023 06:37:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231655AbjDCKhD (ORCPT ); Mon, 3 Apr 2023 06:37:03 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on20618.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaf::618]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 607EB12875; Mon, 3 Apr 2023 03:36:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d16OT57Mm4s3lkBXG2BvM+HvOFyrCJnotImw7XXPi3ik0F471huwjWxql5+hHUiCwF6IueRdMQ7PM5Co+NRW75o/USoz3+Ws6Oi717jveIpD5R7OGtIA2/93XykLsvbS0OxP/iMZSn5i66oknCrrSP2ndiCpHfI9u9yJxamBds54Kzg7BEZf4R5bn/vaUaNxL3S7cT4TBBzZo4CmWV4MJWkdkMOJ4jQ/cJJyDZZ5dUeDCXkIOBJL5WUHFNVDhw3uxCXaZwjOuFCZWUjcJg4+P693/MZ1b49ZAXnc+7I5ysWjTyNg2oCI/ms0js5+swVqePCG2efPvWCVveQWWu2fcQ== 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=VIEbuwGFx0j3/eVF8eQ7Yt7xrWD7sp6ajUPav85rFx8=; b=WJfSNKdazQtV7g8JhYM2yvTfrBpbtfE3zAwwx3iZRdSA3TrfDY/Sg7GMu/0cP8l2QmZ0Vehl8FcSYqNbGxLO3JVeMZ7p6SJ5g7t0wCedmBbeMbt1HTqK7tT0nDhwBfOSe52Xl/lxdmsm/2K1rcKOfHvtJFZJxftKoL3GW+IBkUBjUOFdfCMVnBFzAXvDG1lN/PAb0Ob/J4GuKVlfbrphQLZ9RH4T6detKJWrBkh5z9jNydq2x1FqjM3Lyhlxrmjqu1keJQtMMNVmF+hIr/oX6hILSqJLGeyXRM6NSrVaizDO8R8bpoagH5FdUjuwv9iobD0lgs48chvzI9GG+vr9ZA== 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=VIEbuwGFx0j3/eVF8eQ7Yt7xrWD7sp6ajUPav85rFx8=; b=ICXZcUWEFvogWF0vnFX/zDAIFejWnSJZGfnzeC/6h9hFI7mR6hNM96hJWsxycTsa7VGw2gVCWaQKFLoBDxUwK7ltMdE3sEsy/kCpC+xAS6/QAe7TUvkMwT9P/d1s//MgCPQNCkPx8YOf9ISfRZysLIQeAAOrDpLCmavOT5c8Le4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6452.eurprd04.prod.outlook.com (2603:10a6:208:16d::21) by AS4PR04MB9292.eurprd04.prod.outlook.com (2603:10a6:20b:4e7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.29; Mon, 3 Apr 2023 10:35:10 +0000 Received: from AM0PR04MB6452.eurprd04.prod.outlook.com ([fe80::dfa2:5d65:fad:a2a5]) by AM0PR04MB6452.eurprd04.prod.outlook.com ([fe80::dfa2:5d65:fad:a2a5%3]) with mapi id 15.20.6254.026; Mon, 3 Apr 2023 10:35:10 +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 , Ferenc Fejes , Xiaoliang Yang , Roger Quadros , Pranavi Somisetty , Harini Katakam , Giuseppe Cavallaro , Alexandre Torgue , Michael Sit Wei Hong , Mohammad Athari Bin Ismail , Oleksij Rempel , Jacob Keller , linux-kernel@vger.kernel.org, Ferenc Fejes , Simon Horman Subject: [PATCH v4 net-next 8/9] net: enetc: rename "mqprio" to "qopt" Date: Mon, 3 Apr 2023 13:34:39 +0300 Message-Id: <20230403103440.2895683-9-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403103440.2895683-1-vladimir.oltean@nxp.com> References: <20230403103440.2895683-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: FR0P281CA0221.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ac::17) To AM0PR04MB6452.eurprd04.prod.outlook.com (2603:10a6:208:16d::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6452:EE_|AS4PR04MB9292:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fef957f-ed1f-423a-ff2d-08db342f198f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FRE8+snUODInuCFt6xS7mQF6Fzs5BVpCvNLr+PxZSlIUb2ubeeOG0cLGTMWbxt4pR0eNKsDXcQHGEisp51EV1a4e9He/cvTBpm6JV7+Bq0n2v2FpsidkHPbUhtqXmssyzQJdndiLq7Ucg4dIe6vvqilqPXJdmpLiq2InDgYh8WymsbamruVZSNzajgQCNqVP+7WhKZP4v24FbWEX7ju81+JsC5VocFxhA4XmCnSNf1O4XzSbawzSTc9HHwQB7jERB8BwwzrZvH3hJBawh6nTXAAL9eAwCla0ScNBGKegCvVW5hc6tvesToviXyr/a6ruEkA6TckVrYTUkpPxJEKwbriikNhP8g2H0b+xk2KwI876tO0IjJDcNVVb5JqypApQgIdK8HUNvAZsY+jpv3R3qa5ZJ5YiNR7yCDtCFnJ+GiS86FfRZSUFWr2j5E+0AnBKa3ueQMRvI5xXOp7F2X5VHYveiIKdN1p4QGaiMKG1dkOEC/zDxNwWQJq/y80/ZWeqYauv2pFWla647PZv7IKvd60N8I3xHMhzP2CZMcJ3b3RfXMn5TKNLkAFNZSItBflClpun1NlAhzjWadpR75NWLeEqlJNkrNe+9o4BitCZ8cXUzMnaJ+UPtiJ43DB8/OL4 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6452.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(39860400002)(376002)(346002)(366004)(396003)(451199021)(26005)(1076003)(6506007)(186003)(38350700002)(38100700002)(6512007)(86362001)(316002)(54906003)(41300700001)(7416002)(5660300002)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(6916009)(478600001)(52116002)(8936002)(6666004)(6486002)(36756003)(2616005)(2906002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UafAnyEoGvJpLss5qURFsYXhxrHh+zKbeirAPsyNNHyikof6yGsXTEgbTol6Z8xy/Bv3uvF6e1kRfXPItfrGgM4AjaIHPkNf5b/thdAqL7n6GLQbH8gP7RmJpNM2eQaJsmfNufg6212K5lf5+PR5PJ/nw9adzdaN7+NXJ5hQNJILYQ+AsQZzCmShJ0YbzmgMNT3oLdAYcyAQ0MdTZ7K8nkaeXPvEZgXRkFuXWoSOJukNswNLvjwGd+Aex7SJBktvuN2IbKQK+oypL81fFVGROFn6ZsoKopsr5S5o6waAFqAUt8IIVcse4vo75GHwuQoUaq3fH9X6BKoXghuC7W4jS4pb0oskPPekkg4WC1beuXtCMGaGSaT9gmQ+C5wjxnTN0HdWm/qtJJRIoo9t13eZB30oej36ZOfyGGsbdUOCWkScLgfy0uqmEqXyBi5Pn/o4fPhEvuZ2wW9mw46Rmi0VVK9MoYwUNJ0TZ4A0A11mOlOPKuNAvNA8JmucrIim5jxQFCxvdds4tV650oWHrpWSRAakB9SlPu/tG8mprp9y8WXuBEMxGxf8F2P2hUAFJpwz7Wc8cfduSiB/yvpEYS1SfuCf2nHari9iNRaPfXgvcs/ktSLeJ6wShtkU8WuTpyVfo61ua3Rx4fRg1IDefD5m5CRnCDubIFalbGXnCr+kwsyhThxYwgAnXL6oKtzwQdWAiM+bAHKwTyrTC61euyGOjRmYLckyih+MqU3pNcZ8ebeohnaOJRVmFV80IkOU0JYMBLUHCRJ55ZfISTL3KGUyJQUUrq8jLQ0fKxqT1E7aJp1ntx6+WnKsCCJ2UrgL5iCyXXltH3DD6sGVb82EBV3mL1w+zfmUSoUB71UTubq8nmvWUB54zh4Ld59mbh/HNXJ8UBaKu07hTQBWmMaJYn3WtQSTh38jVULLs7I07gAyyr4pujZyuC46zXmSapyEYmmoT+RAwBSgG5VslrlKoB7vsPrW88/cZIxxAo5jxC8qu2GzEk/PXCgNev0eqLksKiBLMDuk638AmhSHtnopUCGGC+yjETr6qFUrb/0nMPO4jSOVx5Bczmk3XPCndKiQtt7pHwNSFTufDsS/Dhc2rWVTpi6LzN65Uj4A091wFPi6GHbrQYziT8Wt38gsL8bdVRERdyoobEEszHVDE1G75bIMxPv8+LwzKic4qlxddPdpOgO79OY8UXql9jgWEstburIbP5Td/mVq99xMCqg+X3N/RLaTvsucoUUCguVou5EldnXt94144wOj0C3WhOBZOxZIG0j/1WT7/gDcsHc/T/l4IN2ph9tLjPp4XcqXvQFIkkGhiNkILYJPjr6AVkPH3NpoQlVD+QaUj74Vcgkb7MHsktMRqG+3xrGaEXYwgA8AMniUQlJaiMA/ekzWVr93meG62sE9HbcJ1n7KoT/oaV30hhUb3qn2CkLf1u1X4clEN3luT+OCmF2Bi8ruEsCnCZhqWcDGuOai1RqlaWPjIqX3P52+25igTvLbHaZCAY4trqi3beAI4AR2TUASkVeBG50jsTNIwHQ+y4sJgWVuXW1bVdX20JwJqXk35UR3ZVC8WPGEfFBr/1W76D/SfJDRcVszVhC5g5y8eXNCTE1d0MXGPg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fef957f-ed1f-423a-ff2d-08db342f198f X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 10:35:10.2442 (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: 8Mp3wnOYGP8+PjfohlNh8ZEzhY1/mcN7r8Vo/DCm3rBKx8Mkc5Ywyx5g14LWTsFXR0Dj/hQuBXPRAnrGFfaJ4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9292 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Reviewed-by: Simon Horman --- v1->v4: 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);