[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <7b52da08-4137-2c33-012a-b45262360bdd@nvidia.com>
Date: Wed, 21 Apr 2021 22:18:33 +0300
From: Nikolay Aleksandrov <nikolay@...dia.com>
To: Vladimir Oltean <olteanv@...il.com>,
Jakub Kicinski <kuba@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Christian Borntraeger <borntraeger@...ibm.com>,
netdev@...r.kernel.org
Cc: Florian Fainelli <f.fainelli@...il.com>,
Andrew Lunn <andrew@...n.ch>, Jiri Pirko <jiri@...nulli.us>,
Ido Schimmel <idosch@...sch.org>,
Roopa Prabhu <roopa@...dia.com>,
Vladimir Oltean <vladimir.oltean@....com>
Subject: Re: [PATCH net-next] net: bridge: fix error in br_multicast_add_port
when CONFIG_NET_SWITCHDEV=n
On 21/04/2021 21:44, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@....com>
>
> When CONFIG_NET_SWITCHDEV is disabled, the shim for switchdev_port_attr_set
> inside br_mc_disabled_update returns -EOPNOTSUPP. This is not caught,
> and propagated to the caller of br_multicast_add_port, preventing ports
> from joining the bridge.
>
> Reported-by: Christian Borntraeger <borntraeger@...ibm.com>
> Fixes: ae1ea84b33da ("net: bridge: propagate error code and extack from br_mc_disabled_update")
> Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
> ---
> net/bridge/br_multicast.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index 4daa95c913d0..2883601d5c8b 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1625,7 +1625,7 @@ int br_multicast_add_port(struct net_bridge_port *port)
> br_opt_get(port->br,
> BROPT_MULTICAST_ENABLED),
> NULL);
> - if (err)
> + if (err && err != -EOPNOTSUPP)
> return err;
>
> port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats);
>
Acked-by: Nikolay Aleksandrov <nikolay@...dia.com>
Powered by blists - more mailing lists