diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-12-10 02:34:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-12 15:51:33 +0300 |
| commit | c79e84866d2ac637fce921a28288f214e91d662b (patch) | |
| tree | fd5d27227e0f347105e4817fe2c0f105895d5d69 /include/linux/dsa | |
| parent | 22ee9f8e4011fb8a6d75dc2f9a43360d4f400235 (diff) | |
| download | linux-c79e84866d2ac637fce921a28288f214e91d662b.tar.xz | |
net: dsa: tag_sja1105: convert to tagger-owned data
Currently, struct sja1105_tagger_data is a part of struct
sja1105_private, and is used by the sja1105 driver to populate dp->priv.
With the movement towards tagger-owned storage, the sja1105 driver
should not be the owner of this memory.
This change implements the connection between the sja1105 switch driver
and its tagging protocol, which means that sja1105_tagger_data no longer
stays in dp->priv but in ds->tagger_data, and that the sja1105 driver
now only populates the sja1105_port_deferred_xmit callback pointer.
The kthread worker is now the responsibility of the tagger.
The sja1105 driver also alters the tagger's state some more, especially
with regard to the PTP RX timestamping state. This will be fixed up a
bit in further changes.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/dsa')
| -rw-r--r-- | include/linux/dsa/sja1105.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h index d8ee53085c09..9f7d42cbbc08 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -84,9 +84,12 @@ static inline s64 sja1105_ticks_to_ns(s64 ticks) return ticks * SJA1105_TICK_NS; } -static inline bool dsa_port_is_sja1105(struct dsa_port *dp) +static inline struct sja1105_tagger_data * +sja1105_tagger_data(struct dsa_switch *ds) { - return true; + BUG_ON(ds->dst->tag_ops->proto != DSA_TAG_PROTO_SJA1105); + + return ds->tagger_data; } #endif /* _NET_DSA_SJA1105_H */ |