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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 934C9C282C8 for ; Mon, 28 Jan 2019 12:02:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61E84214DA for ; Mon, 28 Jan 2019 12:02:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="K5RicYxj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbfA1MCQ (ORCPT ); Mon, 28 Jan 2019 07:02:16 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726752AbfA1MCO (ORCPT ); Mon, 28 Jan 2019 07:02:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FtDiFC0o848io9ZRs0MFcAXT0si0lF5VtP/5afP4Ybo=; b=K5RicYxjapgKKeD+wRHHz0RP6+/Y8BQ2RYeSkLvZ/nW6kWinkHYnV+WuHyT2m5QfFjrpV/vHBeMZIdo2547NtEBvWg9XmEpcztxYun0N9eErF01vsPO7pYAoWNlAauJ0OEHHLWFypEudJyeaqC3kkgWjyJTvtcxySJ72zbzx4e4= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:08 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:08 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 2/7] mlxsw: spectrum_acl: Move mr_ruleset and mr_rule structs Thread-Topic: [PATCH net-next 2/7] mlxsw: spectrum_acl: Move mr_ruleset and mr_rule structs Thread-Index: AQHUtwFLv43I76M3bEKTU8Wrp6lydA== Date: Mon, 28 Jan 2019 12:02:08 +0000 Message-ID: <20190128120131.2848-3-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DB7PR05MB4250;6:VbMs+y0omKPI+9D7pIN/qQCBdkBNVqWQGhccOk0c9oaES+o9evE6xLU0VYrOwdjcMx7AO9C2EV5T3v1BNkcT9DL41kW+64q9OQPqrC2PxY8kzWpJcSWTUhbHdAmu9nzxznxXg/z+jHigMI52JjG1LfG7XB4uS+QMsjj3Nim05DP8WQiX6wbMSwlm1quMPklV6Nkzj4HRtZRtYuOmKlZX3tpZcmA37ELbMB7iXQ0a63+QB77Fkrb5coPXbD0bE44whSKLwPuAM4RBYFsj3ivSisdkcUuhad7E10zUNmh8T0pfy9ep5WdPsNhtfnxO9M+32Bs0Q26DWXrTWrWhSzX1/ONG0tD82VB0F9NlxHtDcAekjATY5Kuj/bnKrLj9hUjV7tVc0UzZFDLYxuBkHW22iA/bYfUld1bVVJ1HAmgLWic23fenaInButyw/duRaOvtIRxFwSCUieV08FHYdmGZUw==;5:oXf0vSw6OEUYaVw3FaQKns9c/ZMwQklobgZ8uP5kK2yTc61XMh+4Vuf8XTH5fg8G0qdREHX2+MVaW6+fVd5VQLuwx0wycLsQFlJpwRkd4NBHDvXmOW32UfHeKVn83Sd0UaSLDTe9seCDpadZKJzRhTusfDQFV0GNy77/bt8IZWQb2LLAwwWhLyhtkPp73Lr3gWInA9UJypW8XwyydL3b7w==;7:b5rBz4gjpfQXl83bmpOM51f1XtgcVde3NM8eex9E06ZY8dU0ivocKaSeHcRJDHS3Q6i5hrAltXkWnCiIhSuUaGB3dS1pHTSGGiUV2NLRY0EDkBUJV4yhRPfbLMM6P8kv9XkyevT6oRpKSHW8D4OpWA== x-ms-office365-filtering-correlation-id: e13614b1-dbef-4814-49ac-08d685186d75 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020);SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002);DIR:OUT;SFP:1101;SCL:1;SRVR:DB7PR05MB4250;H:DB7PR05MB4940.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qjoZ6wofbPoQABe6c+mOCJ9l3ZB2Psh53aHby9wy7oRduvR7NMyiO8npp2h2irqg+V1qbaA2rwGCxJpuYk/6FMwhuKIEMF8FBilyfF0sgkTupfMmO5nDTQ4bEPig+dEr2Y7SJ/hwsCeRxWBj6Oknk0dnJ6ntRi0ZdxBPlAfuxeiunn8JFV3omq9L9fx7M7cJ7MDHqLqRTY9wh1qO87vUmYU5dILccYj9Rw8x1rv4Lfcb4L4ytiaGlcfoDK5mbOPh8qbkrU681ExyKzn1UAN4E/7lT/YSyauwrdPUdCnmaRudweRtn49Dra3OKPEicqPEiUWMy/MXullgMoJH8xVmwShNt4qCpbIBrHgnO+ONrJFmPFWYSbwEU0NPf8tE0mgEDFBcuCzpSemtIrcRyJKzeGvxw+ezc2PQ9djZ+sbVVZo= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: e13614b1-dbef-4814-49ac-08d685186d75 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:07.5892 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Move the struct to the place where they belong, alongside with the rest of the MR code. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../mellanox/mlxsw/spectrum_acl_tcam.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/driv= ers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 5d29c5050401..11456e1f236f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -862,15 +862,6 @@ struct mlxsw_sp_acl_tcam_flower_rule { struct mlxsw_sp_acl_tcam_entry entry; }; =20 -struct mlxsw_sp_acl_tcam_mr_ruleset { - struct mlxsw_sp_acl_tcam_chunk *chunk; - struct mlxsw_sp_acl_tcam_group group; -}; - -struct mlxsw_sp_acl_tcam_mr_rule { - struct mlxsw_sp_acl_tcam_entry entry; -}; - static int mlxsw_sp_acl_tcam_flower_ruleset_add(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam *tcam, @@ -984,6 +975,15 @@ static const struct mlxsw_sp_acl_profile_ops mlxsw_sp_= acl_tcam_flower_ops =3D { .rule_activity_get =3D mlxsw_sp_acl_tcam_flower_rule_activity_get, }; =20 +struct mlxsw_sp_acl_tcam_mr_ruleset { + struct mlxsw_sp_acl_tcam_chunk *chunk; + struct mlxsw_sp_acl_tcam_group group; +}; + +struct mlxsw_sp_acl_tcam_mr_rule { + struct mlxsw_sp_acl_tcam_entry entry; +}; + static int mlxsw_sp_acl_tcam_mr_ruleset_add(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam *tcam, --=20 2.20.1