diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-12-14 03:45:35 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-12-14 12:45:16 +0000 |
| commit | c8a2a011cd04054a6577d8cf774adf9e09302876 (patch) | |
| tree | 42976cb39243649db2ab4bfd9a1523944a708344 /include/linux/dsa | |
| parent | net: dsa: tag_sja1105: fix zeroization of ds->priv on tag proto disconnect (diff) | |
| download | wireguard-linux-c8a2a011cd04054a6577d8cf774adf9e09302876.tar.xz wireguard-linux-c8a2a011cd04054a6577d8cf774adf9e09302876.zip | |
net: dsa: sja1105: fix broken connection with the sja1110 tagger
The driver was incorrectly converted assuming that "sja1105" is the only
tagger supported by this driver. This results in SJA1110 switches
failing to probe:
sja1105 spi1.0: Unable to connect to tag protocol "sja1110": -EPROTONOSUPPORT
sja1105: probe of spi1.2 failed with error -93
Add DSA_TAG_PROTO_SJA1110 to the list of supported taggers by the
sja1105 driver. The sja1105_tagger_data structure format is common for
the two tagging protocols.
Fixes: c79e84866d2a ("net: dsa: tag_sja1105: convert to tagger-owned data")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/dsa')
| -rw-r--r-- | include/linux/dsa/sja1105.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h index e9cb1ae6d742..159e43171ccc 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -70,7 +70,8 @@ struct sja1105_skb_cb { static inline struct sja1105_tagger_data * sja1105_tagger_data(struct dsa_switch *ds) { - BUG_ON(ds->dst->tag_ops->proto != DSA_TAG_PROTO_SJA1105); + BUG_ON(ds->dst->tag_ops->proto != DSA_TAG_PROTO_SJA1105 && + ds->dst->tag_ops->proto != DSA_TAG_PROTO_SJA1110); return ds->tagger_data; } |