From patchwork Wed Jan 16 20:00:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026163 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TpReQuv/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynV34sjz9sCh for ; Thu, 17 Jan 2019 07:03:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732111AbfAPUDX (ORCPT ); Wed, 16 Jan 2019 15:03:23 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:40094 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732082AbfAPUDV (ORCPT ); Wed, 16 Jan 2019 15:03:21 -0500 Received: by mail-yw1-f66.google.com with SMTP id g194so2910488ywe.7 for ; Wed, 16 Jan 2019 12:03:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Di0uk7ChLXqoTDr/qz8RwiDRfIdXYC9TpTLQhiz/VoY=; b=TpReQuv/UR4YXDSq4br54XAYWtc2h431YcwZZWEPFpMRy2cCjG62CLtTJDZDdRpupD /R1X8H64yrkdL73LWw7AtRLrXo8Xh8LHeXeVRSVDK+JUc+l8ZHXhLyy77NI3u4yNZFEX t1PH2Vs/oK+krbAqRqr66So1lRWK+eDlYsc0t1LwhtbTyxmqBlaetxh5mTLk5yvoYdnL A7T20lek0UFkXDzDYLVWHVxTiL/SifIiRZBM9JkSpBLv3PVzqv/Gfy5yMxAe7jamaEW8 mYVjBtkL12ynqAet4l96KOFmpXvgaQdJXOGU2N2Zev9EUzQhJVWtAFSQjGkBmDMqspRy 6ztw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Di0uk7ChLXqoTDr/qz8RwiDRfIdXYC9TpTLQhiz/VoY=; b=FjuRuUDgWxhvC//IiNoqbx/FMmE9XbCSbC7RatnDuaREbm0MFit1EzyprPDwM4al/t CjGPxOtmISFiJCKLh5tu2oBdjmeYY+G8EvQBmh0IOaBHdBZ3+DpRKexh0Q/SvUdbgt5X Fj1M8aZhgT5hS6cE+61sig4wynxRYM0Wd6pZb+QCkL9b0KI4SPH+vOJ7pcjl8Y4HF6wA eoFLJEy8i8kXgJVVxAr1dZo0MY4rDkDBMCvFqC80YLIBZxAyFPnQdUkeqSLq/8swOwTM u0l2lxd1Z+zsA10iDdfJZXLeNsUFM0uMGZy0PtuR4CQNynGlZ54G5rzGEj+wlZw1JSwn y46Q== X-Gm-Message-State: AJcUukd0Yin+YqpBiBuZfDRb1tUt1DZJtUFOeVsZ35YEtynBAif5MAYt 21QxYOsnnNAV4W6RKydk/ySelaJj X-Google-Smtp-Source: ALg8bN5xRpxn3NqM+8nPbZ/STMKBdCTX7B+Tn3Qz4l5kocQD8sWs/jsG7P6lzf7fQ8T5fXrSEVlgAg== X-Received: by 2002:a81:b54f:: with SMTP id c15mr9508557ywk.274.1547669000385; Wed, 16 Jan 2019 12:03:20 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:19 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 01/14] net: bridge: multicast: Propagate br_mc_disabled_update() return Date: Wed, 16 Jan 2019 12:00:49 -0800 Message-Id: <20190116200102.2749-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some Ethernet switches might not be able to support disabling multicast flooding globally when e.g: several bridges span the same physical device, propagate the return value of br_mc_disabled_update() such that this propagates correctly to user-space. Signed-off-by: Florian Fainelli --- net/bridge/br_multicast.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 3aeff0895669..09fc92541873 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -813,7 +813,7 @@ static void br_ip6_multicast_port_query_expired(struct timer_list *t) } #endif -static void br_mc_disabled_update(struct net_device *dev, bool value) +static int br_mc_disabled_update(struct net_device *dev, bool value) { struct switchdev_attr attr = { .orig_dev = dev, @@ -822,11 +822,13 @@ static void br_mc_disabled_update(struct net_device *dev, bool value) .u.mc_disabled = !value, }; - switchdev_port_attr_set(dev, &attr); + return switchdev_port_attr_set(dev, &attr); } int br_multicast_add_port(struct net_bridge_port *port) { + int ret; + port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY; timer_setup(&port->multicast_router_timer, @@ -837,8 +839,11 @@ int br_multicast_add_port(struct net_bridge_port *port) timer_setup(&port->ip6_own_query.timer, br_ip6_multicast_port_query_expired, 0); #endif - br_mc_disabled_update(port->dev, - br_opt_get(port->br, BROPT_MULTICAST_ENABLED)); + ret = br_mc_disabled_update(port->dev, + br_opt_get(port->br, + BROPT_MULTICAST_ENABLED)); + if (ret) + return ret; port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats); if (!port->mcast_stats) @@ -1937,12 +1942,16 @@ static void br_multicast_start_querier(struct net_bridge *br, int br_multicast_toggle(struct net_bridge *br, unsigned long val) { struct net_bridge_port *port; + int err; spin_lock_bh(&br->multicast_lock); if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val) goto unlock; - br_mc_disabled_update(br->dev, val); + err = br_mc_disabled_update(br->dev, val); + if (err) + goto unlock; + br_opt_toggle(br, BROPT_MULTICAST_ENABLED, !!val); if (!br_opt_get(br, BROPT_MULTICAST_ENABLED)) goto unlock;