net: dsa: avoid calling ds->ops->port_hsr_leave() when unoffloaded

This mirrors what we do in dsa_port_lag_leave() and
dsa_port_bridge_leave(): when ds->ops->port_hsr_join() returns
-EOPNOTSUPP, we fall back to a software implementation where dp->hsr_dev
is NULL, and the unoffloaded port is no longer bothered with calls from
the HSR layer.

This helps, for example, with interlink ports which current DSA drivers
don't know how to offload. We have to check only in port_hsr_join() for
the port type, then in port_hsr_leave() we are sure we're dealing only
with known port types.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20251130131657.65080-4-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 082573ae6864aabe4d18c2d966432e150432015d..ca3a7f52229ba9ee5e575ce400d6c615058750c5 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1909,6 +1909,9 @@ void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr)
        struct dsa_switch *ds = dp->ds;
        int err;
 
+       if (!dp->hsr_dev)
+               return;
+
        dp->hsr_dev = NULL;
 
        if (ds->ops->port_hsr_leave) {