Message ID | 20190529020737.4172-6-saeedm@mellanox.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="g9pjmBRY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45DDdW2PGVz9s55 for <patchwork-incoming-netdev@ozlabs.org>; Wed, 29 May 2019 12:08:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726538AbfE2CIO (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Tue, 28 May 2019 22:08:14 -0400 Received: from mail-eopbgr70073.outbound.protection.outlook.com ([40.107.7.73]:48196 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726508AbfE2CIN (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 28 May 2019 22:08:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RSQK+Gov9wjP/jiZE/gpZiQVKVTRfGvtxga1ZSzx3tI=; b=g9pjmBRYs1OSJLTreNdWbzQD65oQhRiemVx6TC9U+PHEZkei0tQKFZV/CgHjld2iWVO7NaG+gEEAnPNh2uZ/zfaeviZyhN8OMmThiycM9vTk31U/0fJAyZ6hNHQk5aPSnu6kNozB+PDKaWgVvCUdGj/MfDh21kf5n1ZOgCi1Neo= Received: from DB8PR05MB5898.eurprd05.prod.outlook.com (20.179.9.32) by DB8PR05MB5947.eurprd05.prod.outlook.com (20.179.11.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.16; Wed, 29 May 2019 02:08:06 +0000 Received: from DB8PR05MB5898.eurprd05.prod.outlook.com ([fe80::7159:5f3a:906:6aab]) by DB8PR05MB5898.eurprd05.prod.outlook.com ([fe80::7159:5f3a:906:6aab%7]) with mapi id 15.20.1922.021; Wed, 29 May 2019 02:08:06 +0000 From: Saeed Mahameed <saeedm@mellanox.com> To: "David S. Miller" <davem@davemloft.net> CC: "netdev@vger.kernel.org" <netdev@vger.kernel.org>, wenxu <wenxu@ucloud.cn>, Roi Dayan <roid@mellanox.com>, Saeed Mahameed <saeedm@mellanox.com> Subject: [net 5/6] net/mlx5e: restrict the real_dev of vlan device is the same as uplink device Thread-Topic: [net 5/6] net/mlx5e: restrict the real_dev of vlan device is the same as uplink device Thread-Index: AQHVFcNaicvcr4zI/kuQbmOY1pe9zQ== Date: Wed, 29 May 2019 02:08:06 +0000 Message-ID: <20190529020737.4172-6-saeedm@mellanox.com> References: <20190529020737.4172-1-saeedm@mellanox.com> In-Reply-To: <20190529020737.4172-1-saeedm@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-originating-ip: [73.15.39.150] x-clientproxiedby: BYAPR05CA0066.namprd05.prod.outlook.com (2603:10b6:a03:74::43) To DB8PR05MB5898.eurprd05.prod.outlook.com (2603:10a6:10:a4::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=saeedm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3f3ce396-5781-418f-9696-08d6e3da7d08 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:DB8PR05MB5947; x-ms-traffictypediagnostic: DB8PR05MB5947: x-microsoft-antispam-prvs: <DB8PR05MB59476A6EA32CD16F2BA47921BE1F0@DB8PR05MB5947.eurprd05.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:3968; x-forefront-prvs: 0052308DC6 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(376002)(346002)(39860400002)(396003)(189003)(199004)(3846002)(6116002)(54906003)(6486002)(8936002)(2906002)(86362001)(81166006)(6506007)(50226002)(8676002)(81156014)(99286004)(53936002)(256004)(14454004)(386003)(14444005)(71200400001)(52116002)(7736002)(305945005)(102836004)(6436002)(71190400001)(5660300002)(316002)(36756003)(186003)(4326008)(476003)(68736007)(486006)(6512007)(446003)(1076003)(66476007)(73956011)(66446008)(66556008)(66946007)(25786009)(478600001)(26005)(2616005)(107886003)(76176011)(66066001)(64756008)(6916009)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB8PR05MB5947; H:DB8PR05MB5898.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: Hxv3bDiAsOHB2N4FAiXmThhtLjBjErPH8v6AF/XBhEMNNTv+zLNF5pQ/bX4Fg+56VWcTvtammH3vsXB92jNN1/Q8ZaMQo+PScTaKUFIMw09cQu1RItkiDmByeiPYBaKDkG/WvJIjEDnWmnZZm096OWVg7d9J8N73TJM5gHzqBuwJmO5IlSRQmLo5cfK5LtjJnazg9keCtlxOwFwzmoqFPmjMx1TM4dh1vwqBRIFnNodlPmpcA/+pTGDQ6hxwfxrAm6byhXPb0y/22UQRBRnxa6ZRVDyC9empYbeXSfEB5vvXsBcukY11dQJZujiXKzwI/tTdcrFbRSRRAiDs6Zy/2sUuOc9uC7HR1BzXJcCf1X0qvxcx6IvBXG4IPqMAQo97EFDAnURhivBBXwBOsmXMHreu5wSJpywji0GfbwM6jOw= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f3ce396-5781-418f-9696-08d6e3da7d08 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2019 02:08:06.4091 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: saeedm@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR05MB5947 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
[net,1/6] net/mlx5: Fix error handling in mlx5_load()
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 5283e16c69e4..9aea9c5b2ce8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -813,7 +813,7 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb, struct net_device *netdev = netdev_notifier_info_to_dev(ptr); if (!mlx5e_tc_tun_device_to_offload(priv, netdev) && - !is_vlan_dev(netdev)) + !(is_vlan_dev(netdev) && vlan_dev_real_dev(netdev) == rpriv->netdev)) return NOTIFY_OK; switch (event) {