diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-02-26 10:20:47 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-03-05 12:11:05 -0800 |
| commit | 0b1324cdd8de9f54f9daf689a4ae59783c333510 (patch) | |
| tree | 991952409fe93bd0ea73f8683b497e31bfe6952f /drivers/net/dsa | |
| parent | ab99e1167293726f016360a5dbbbc10386fd7d66 (diff) | |
| parent | abacaf559950eec0d99d37ff6b92049409af5943 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.0-rc3).
No conflicts.
Adjacent changes:
net/netfilter/nft_set_rbtree.c
fb7fb4016300 ("netfilter: nf_tables: clone set on flush only")
3aea466a4399 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/realtek/rtl8365mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c index c575e164368c..f938a3f701cc 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -769,7 +769,7 @@ static int rtl8365mb_phy_ocp_write(struct realtek_priv *priv, int phy, out: rtl83xx_unlock(priv); - return 0; + return ret; } static int rtl8365mb_phy_read(struct realtek_priv *priv, int phy, int regnum) |