diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
| commit | 34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch) | |
| tree | b33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /include/linux/dsa/sja1105.h | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'include/linux/dsa/sja1105.h')
| -rw-r--r-- | include/linux/dsa/sja1105.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h index 159e43171ccc..c177322f793d 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -48,13 +48,9 @@ struct sja1105_deferred_xmit_work { /* Global tagger data */ struct sja1105_tagger_data { - /* Tagger to switch */ void (*xmit_work_fn)(struct kthread_work *work); void (*meta_tstamp_handler)(struct dsa_switch *ds, int port, u8 ts_id, enum sja1110_meta_tstamp dir, u64 tstamp); - /* Switch to tagger */ - bool (*rxtstamp_get_state)(struct dsa_switch *ds); - void (*rxtstamp_set_state)(struct dsa_switch *ds, bool on); }; struct sja1105_skb_cb { |