diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 15:44:52 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 15:44:52 -0300 |
| commit | 717d182e4173c037fb9e720a046dec804fd9990e (patch) | |
| tree | 51f14a932abcbbb17c3eb023c63179e2843982d7 /net/core/dev.c | |
| parent | a55b7bb1c14662490689e094964ecc5387bb2b55 (diff) | |
| parent | fb0155a09b0224a7147cb07a4ce6034c8d29667f (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get v5.10 development in sync with the main kernel
sources.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/core/dev.c')
| -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; |