Skip to content

Commit 7a4d746

Browse files
committed
Merge branch 'further-sja1105-phylink-link-replay-fixups'
Vladimir Oltean says: ==================== Further SJA1105 phylink link replay fixups While I was playing around with the subsystem knowledge in Chris Mason's review-prompts to see what LLMs would have needed to catch the bug behind commit bfd264f ("net: dsa: sja1105: protect link replay helpers against NULL phylink instance"), it flagged another issue instead, which IMO is valid. This is being fixed in patch 2/2. Patch 1/2 is preparatory reordering for that. I haven't noticed any physical issues, it only has to do with the soundness of the new call path introduced in January in commit 0b2edc5 ("net: dsa: sja1105: let phylink help with the replay of link callbacks"). ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 0cc0c2e + ce2da64 commit 7a4d746

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/net/dsa/sja1105/sja1105_main.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,14 +2339,13 @@ int sja1105_static_config_reload(struct sja1105_private *priv,
23392339
goto out;
23402340
}
23412341

2342+
rc = sja1105_reload_cbs(priv);
2343+
2344+
out:
23422345
dsa_switch_for_each_available_port(dp, ds)
23432346
if (dp->pl)
23442347
phylink_replay_link_end(dp->pl);
23452348

2346-
rc = sja1105_reload_cbs(priv);
2347-
if (rc < 0)
2348-
goto out;
2349-
out:
23502349
mutex_unlock(&priv->mgmt_lock);
23512350
mutex_unlock(&priv->fdb_lock);
23522351

0 commit comments

Comments
 (0)