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 32B63C282CA for ; Tue, 12 Feb 2019 16:30:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 026BB20842 for ; Tue, 12 Feb 2019 16:30:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="HZBPMZ9R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730764AbfBLQaF (ORCPT ); Tue, 12 Feb 2019 11:30:05 -0500 Received: from mail-eopbgr10041.outbound.protection.outlook.com ([40.107.1.41]:30784 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730717AbfBLQaD (ORCPT ); Tue, 12 Feb 2019 11:30:03 -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=LV9CTOi4YFZSqeGIEn8I/UoVjvUnRHzbALgqJHWtWHs=; b=HZBPMZ9RiK88RHiLraiAhOoFWOCrV8wkIv+bB+rvFHDT8UfuB2WlsX6AMnJn235Hnf96dyPVOplISz8Bg6dpJUSQtC87wOvW/fg4wG52F8ITmThAKfT5Z+7+wG8FUeB4dwRn+ZIg8VAgaOPpXC9OBr27AENW5nJHRgHegzshtWI= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB6597.eurprd05.prod.outlook.com (20.179.2.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.19; Tue, 12 Feb 2019 16:29:54 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866%5]) with mapi id 15.20.1601.023; Tue, 12 Feb 2019 16:29:54 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Nir Dotan , mlxsw , Ido Schimmel , Pablo Neira Ayuso Subject: [PATCH net-next 3/4] mlxsw: spectrum_flower: Fix VLAN modify action support Thread-Topic: [PATCH net-next 3/4] mlxsw: spectrum_flower: Fix VLAN modify action support Thread-Index: AQHUwvAvc5D88Bfgy0G6xz80aZ1aJQ== Date: Tue, 12 Feb 2019 16:29:53 +0000 Message-ID: <20190212162924.29777-4-idosch@mellanox.com> References: <20190212162924.29777-1-idosch@mellanox.com> In-Reply-To: <20190212162924.29777-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0277.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::25) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) 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;AM6PR05MB6597;6:KFOKv6Jo+xWFT7u66m7THAeCzpXa7vSs8XyNx+ItYP5ZRBcSO8PHE0qLVpRPe2yIrD3n3PKEMG9o+Ykbx7F2M+FXn2gPG2XQ9k8SdF6sV46i9ouZVVI2lITgi10mhVnaK/aIiWBu05glI9GLdvK51MrUGxusWptPG9RxaEAOJ53Am620ycSdVS+Pz60S3SE2K6kdd54qNxy7MyasWL18+G9G/VEMUZvbyqlQiGwsTHNe/Wmr6rDqwypvT7TTGupGCCpJkaEEexm08rNDyUlhsX8ibd43XPsO6RtYf3QF0wHqZqKAYqLDSyjszN/Qnxfol+46hmamlNtL3SWCMmvwPxwiN0honmDyfn0Z1LmkJWBWcXClca9jZoVfSy70McZDhQNFEUjphiwe94UrydoKP29sxxNWejr2PuHX2En69vBNr5m9gvjFwdzXsnztdCJXrXPM1diKLMD0HJbzwRxLYw==;5:mDbnBPC4hTXkZOiJNACPPvDthWr/iaCT6VuIuWa9E07Ip/ksmrFStUciKlWSW14HfQJ3CHAEIbo5gSxQRjfjlZBW0Tki1EkpKhEjFC9Qph47lputTgLQ86LTb35QzGCmhxS+a6RPhq+yfpB68TnMVbWavVaQXG+6JL/41+DU2Fh77V7hBVaHJrPnZZeiaHgFny8XakumPNoNmdMYo5BATw==;7:gOthNIvvjkwbzW6joozUub6PnOGdQ3bdm6QLw8B9TdXskNmr5XVzk8qQim2BrFjYP3BmEYXHAcLP2wuglmKoXGDcYKK7AvD3eh0iNSZc23+u7hhFr/Hyrg/hu3QbctbdinHbgiwdn2VqLZNmsnvjTQ== x-ms-office365-filtering-correlation-id: 5d71195d-1ee0-4a63-e810-08d69107515f 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:AM6PR05MB6597; x-ms-traffictypediagnostic: AM6PR05MB6597: x-microsoft-antispam-prvs: x-forefront-prvs: 0946DC87A1 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(136003)(39860400002)(366004)(396003)(189003)(199004)(478600001)(2351001)(36756003)(14454004)(6506007)(386003)(76176011)(99286004)(4744005)(71190400001)(71200400001)(256004)(7736002)(97736004)(2906002)(305945005)(316002)(8676002)(54906003)(81156014)(8936002)(1730700003)(81166006)(6436002)(50226002)(6116002)(53936002)(3846002)(25786009)(5640700003)(6486002)(6916009)(446003)(86362001)(6512007)(2616005)(4326008)(476003)(486006)(105586002)(106356001)(2501003)(68736007)(52116002)(186003)(66066001)(26005)(102836004)(11346002)(1076003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB6597;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A: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: yl5Z+o3lvXOCBfG55prbpv1FWLw7j+9tbZjs7SHrkHQWS+3pEFInHy20iHvvrU9dmc2g5Sr1JSidibd/B0Y60Bp0lnde4YIU4yuTcd1w9X8VBvUr6O71Ua6UHJFYCd8rUhaf8MGkVjAJlccLV+Y9LtzzBWZnmwsFcEfgk+yr4rFch6YMsUYVEppjHCgpZJSutukUR6Wyqs7zh7oCS5R3y9aEojNGbHil0VAchYeNcYbe2nH6PbcfNurQP7HFkdPscInW5gFIVq8bT/U5RO1puQElQiSnQdW68cjYxa92caAAnqEun/+O4+TPyAUkcHo7ltgDQnvOjJvCnS0Ww6jLSiN4tFjR665EFyOGyXh9RsvzCK+r2TmcHH8/6Df0+4FuQFU7rGU+giqH4pmjdCOtlPP39x+otU9JE7/HpFqo6Uc= 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: 5d71195d-1ee0-4a63-e810-08d69107515f X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2019 16:29:52.9057 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6597 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver does not support VLAN push and pop, but only VLAN modify. Fixes: 738678817573 ("drivers: net: use flow action infrastructure") Signed-off-by: Ido Schimmel Acked-by: Jiri Pirko Cc: Pablo Neira Ayuso --- drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/driver= s/net/ethernet/mellanox/mlxsw/spectrum_flower.c index 9af9f5c1b25c..15f804453cd6 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c @@ -102,8 +102,7 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_s= p *mlxsw_sp, return err; } break; - case FLOW_ACTION_VLAN_PUSH: - case FLOW_ACTION_VLAN_POP: { + case FLOW_ACTION_VLAN_MANGLE: { u16 proto =3D be16_to_cpu(act->vlan.proto); u8 prio =3D act->vlan.prio; u16 vid =3D act->vlan.vid; --=20 2.20.1