diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 09:24:49 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 09:49:29 +0100 |
| commit | b11919e1bb7f6f6273f5a33947b8496da2769eb8 (patch) | |
| tree | f2ff877b9b0363f8fc97f1c94316f763904ec41f /drivers/net/dsa | |
| parent | d1c722867f8022a27182b9a1d84e9bca75486c9a (diff) | |
| parent | e095493091e850d5292ad01d8fbf5cde1d89ac53 (diff) | |
| download | linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.tar.gz linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.tar.bz2 linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the left-over fixes before the net-next pull-request.
net/mptcp/subflow.c
d3295fee3c75 ("mptcp: use proper req destructor for IPv6")
36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/lan9303-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index 80f07bd20593..2e270b479143 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -1005,9 +1005,11 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, ret = lan9303_read_switch_port( chip, port, lan9303_mib[u].offset, ®); - if (ret) + if (ret) { dev_warn(chip->dev, "Reading status port %d reg %u failed\n", port, lan9303_mib[u].offset); + reg = 0; + } data[u] = reg; } } |