net: Fix bridge enslavement failure

[ Upstream commit e1b9efe6ba ]

When a netdev is enslaved to a bridge, its parent identifier is queried.
This is done so that packets that were already forwarded in hardware
will not be forwarded again by the bridge device between netdevs
belonging to the same hardware instance.

The operation fails when the netdev is an upper of netdevs with
different parent identifiers.

Instead of failing the enslavement, have dev_get_port_parent_id() return
'-EOPNOTSUPP' which will signal the bridge to skip the query operation.
Other callers of the function are not affected by this change.

Fixes: 7e1146e8c1 ("net: devlink: introduce devlink_compat_switch_id_get() helper")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reported-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ido Schimmel 2020-09-10 14:01:26 +03:00 committed by Greg Kroah-Hartman
parent acd04a157b
commit d3c2188ee6
1 changed files with 1 additions and 1 deletions

View File

@ -8241,7 +8241,7 @@ int dev_get_port_parent_id(struct net_device *dev,
if (!first.id_len) if (!first.id_len)
first = *ppid; first = *ppid;
else if (memcmp(&first, ppid, sizeof(*ppid))) else if (memcmp(&first, ppid, sizeof(*ppid)))
return -ENODATA; return -EOPNOTSUPP;
} }
return err; return err;