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=-1.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS 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 0B770C282D8 for ; Wed, 30 Jan 2019 23:03:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEEA120881 for ; Wed, 30 Jan 2019 23:03:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uX72X3Ya" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728522AbfA3XDI (ORCPT ); Wed, 30 Jan 2019 18:03:08 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:44693 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725798AbfA3XDH (ORCPT ); Wed, 30 Jan 2019 18:03:07 -0500 Received: by mail-qt1-f196.google.com with SMTP id n32so1473231qte.11 for ; Wed, 30 Jan 2019 15:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:from:to:cc:subject:in-reply-to:references :mime-version:content-disposition:content-transfer-encoding; bh=bwRfQ2QgF9a1kG1xuFituj2Rso7XQNo/VldBI8HvrWc=; b=uX72X3YaaBjBYFpkoMIB6J5pUJFJfZQLvKaxNuvOd2F+9DnvvpyFLxoJ+8eFEDj+7X NDSjeUezMU0nCoCcQqe/x8a808jiZS69VQRddjkuFD/EB115QXd5A+soWdiZhQ/PK6eJ wwk6EPQtwNDSABdQ6CyWEUCtkaZK5VVoqA6E6eCA9LBp4nodtj/UkENE9ed2OsHlE885 LynkaaRQKfWbv0VbXJIIbjb30fAfAePqNkY5grq58ET21UVPEKC+JBPnZ/rw+n1WJNlo dlTEam5XSW5e0pFD8/DipMfDZkXH0XbfrycrJUFTv3IGYV10I+79GcLq2A0iYodHwjy6 TwDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:from:to:cc:subject:in-reply-to :references:mime-version:content-disposition :content-transfer-encoding; bh=bwRfQ2QgF9a1kG1xuFituj2Rso7XQNo/VldBI8HvrWc=; b=VJRrhRC4bAW1iMSPLKAu1kg9sCXKEa4ZowoqXBNWMUqfdUaeYZOiHXY8henEsiz/NR x/uIKRJoq3fXEr+h1vmx0W5U7Tk6egc53haSAwHMgbG6GS7HIBAj9U1l40bV+uXy0fy6 g0AW3caHQm/H/h5LXpopgQAaOlbzQCnJWVOUaR71ubsGSpfKb4qhbMzzwR347nf/4faU 7QhkF9p0P6xY0php/W6lD4jwAhWz8prvjZ63kvKOVqPgqRjYufYEdT7azKPI/mF9Ox/W vA8uWqTlZFyEkHh/490LyfVpoFU0oqhIaXpjilY1EA3fi+va5ZlPS81iNzZdpoU/d/Tw O2yw== X-Gm-Message-State: AJcUukfWvYSMtdzr2CfPHftYqzisCmgmc8xFyCgNxzQo3EBjbVImANp1 wpWGGopEaedVGp/5IdbAYLo= X-Google-Smtp-Source: ALg8bN5FKMmHkyxAicS13TJTmwKMq8RJ/1smdi3/oXFrEmuUdT+PToXK+XHFgW5DWjB6cN/Y8oRF3g== X-Received: by 2002:aed:3802:: with SMTP id j2mr32597230qte.146.1548887910900; Wed, 30 Jan 2019 14:38:30 -0800 (PST) Received: from localhost (modemcable249.105-163-184.mc.videotron.ca. [184.163.105.249]) by smtp.gmail.com with ESMTPSA id a185sm4026316qkb.1.2019.01.30.14.38.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 14:38:30 -0800 (PST) Date: Wed, 30 Jan 2019 17:38:29 -0500 Message-ID: <20190130173829.GD3207@t480s.localdomain> From: Vivien Didelot To: Florian Fainelli Cc: netdev@vger.kernel.org, Florian Fainelli , andrew@lunn.ch, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: Re: [PATCH net-next v2 08/12] net: dsa: Add ndo_vlan_rx_{add,kill}_vid implementation In-Reply-To: <20190130005548.2212-9-f.fainelli@gmail.com> References: <20190130005548.2212-1-f.fainelli@gmail.com> <20190130005548.2212-9-f.fainelli@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Florian, On Tue, 29 Jan 2019 16:55:44 -0800, Florian Fainelli wrote: > - if (br_vlan_enabled(dp->bridge_dev)) > + /* Can be called from dsa_slave_port_obj_add() or > + * dsa_slave_vlan_rx_add_vid() > + */ > + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) || > + !dp->bridge_dev) if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev)) This would be sufficient. > > return 0; > @@ -270,7 +274,11 @@ int dsa_port_vlan_del(struct dsa_port *dp, > if (netif_is_bridge_master(vlan->obj.orig_dev)) > return -EOPNOTSUPP; > > - if (br_vlan_enabled(dp->bridge_dev)) > + /* Can be called from dsa_slave_port_obj_del() or > + * dsa_slave_vlan_rx_kill_vid() > + */ > + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) || > + !dp->bridge_dev) Same here. Thanks, Vivien