diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-11 01:06:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-11 01:06:48 +0300 |
| commit | cdaa7a73700d40ffb4250b845422e4c4102feab5 (patch) | |
| tree | 4bcc4e0e4cef199387f852ec4f6bfe07f0f0f59b /net | |
| parent | 9d3b2d3e4942cb82630f0d638de4b2253c0af56d (diff) | |
| parent | 6374a5606990ea4de7fe0f7035dd04422c4690f5 (diff) | |
| download | linux-cdaa7a73700d40ffb4250b845422e4c4102feab5.tar.xz | |
Merge branch 'net-Fix-bridge-enslavement-failure'
Ido Schimmel says:
====================
net: Fix bridge enslavement failure
Patch #1 fixes an issue in which an upper netdev cannot be enslaved to a
bridge when it has multiple netdevs with different parent identifiers
beneath it.
Patch #2 adds a test case using two netdevsim instances.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4086d335978c..266073e300b5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8647,7 +8647,7 @@ int dev_get_port_parent_id(struct net_device *dev, if (!first.id_len) first = *ppid; else if (memcmp(&first, ppid, sizeof(*ppid))) - return -ENODATA; + return -EOPNOTSUPP; } return err; |