diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-28 00:10:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-28 00:10:16 +0300 |
| commit | aae0fdac008e40f3f4de32a6e1ac686b769a9f03 (patch) | |
| tree | 579ecd683ca4111cc6d6f81f2d16b2f09f3d25b5 /include/linux | |
| parent | 23c9c2b314bab7f7f807a2f0cfe06cc4451b6eb7 (diff) | |
| parent | 39e5308b3250666cc92c5ca33a667698ac645bd2 (diff) | |
| download | linux-aae0fdac008e40f3f4de32a6e1ac686b769a9f03.tar.xz | |
Merge branch 'ocelot-ptp'
Yangbo Lu says:
====================
Support Ocelot PTP Sync one-step timestamping
This patch-set is to support Ocelot PTP Sync one-step timestamping.
Actually before that, this patch-set cleans up and optimizes the
DSA slave tx timestamp request handling process.
Changes for v2:
- Split tx timestamp optimization patch.
- Updated doc patch.
- Freed skb->cb usage in dsa core driver, and moved to device
drivers.
- Other minor fixes.
Changes for v3:
- Switched sequence of patch #3 and #4 with rebasing to fix build.
- Replaced hard coded 48 of memset(skb->cb, 0, 48) with sizeof().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -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 dd93735ae228..1eb84562b311 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -47,11 +47,12 @@ struct sja1105_tagger_data { }; struct sja1105_skb_cb { + struct sk_buff *clone; u32 meta_tstamp; }; #define SJA1105_SKB_CB(skb) \ - ((struct sja1105_skb_cb *)DSA_SKB_CB_PRIV(skb)) + ((struct sja1105_skb_cb *)((skb)->cb)) struct sja1105_port { u16 subvlan_map[DSA_8021Q_N_SUBVLAN]; |