diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-07-29 09:35:54 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-07-29 09:35:54 +0200 |
commit | 0e8655b4e852ef97655648b91ce780384a073ff4 (patch) | |
tree | 11052a81da749dda3357f7748bdf93549c8007bf /drivers/net/dsa/microchip/ksz9477.h | |
parent | drm/gma500: Make I2C terminology more inclusive (diff) | |
parent | Merge tag 'amd-drm-fixes-6.11-2024-07-25' of https://gitlab.freedesktop.org/a... (diff) | |
download | linux-0e8655b4e852ef97655648b91ce780384a073ff4.tar.xz linux-0e8655b4e852ef97655648b91ce780384a073ff4.zip |
Merge drm/drm-next into drm-misc-next
Backmerging to get a late RC of v6.10 before moving into v6.11.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/dsa/microchip/ksz9477.h')
-rw-r--r-- | drivers/net/dsa/microchip/ksz9477.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dsa/microchip/ksz9477.h b/drivers/net/dsa/microchip/ksz9477.h index ce1e656b800b..239a281da10b 100644 --- a/drivers/net/dsa/microchip/ksz9477.h +++ b/drivers/net/dsa/microchip/ksz9477.h @@ -36,6 +36,8 @@ int ksz9477_port_mirror_add(struct ksz_device *dev, int port, bool ingress, struct netlink_ext_ack *extack); void ksz9477_port_mirror_del(struct ksz_device *dev, int port, struct dsa_mall_mirror_tc_entry *mirror); +int ksz9477_errata_monitor(struct ksz_device *dev, int port, + u64 tx_late_col); void ksz9477_get_caps(struct ksz_device *dev, int port, struct phylink_config *config); int ksz9477_fdb_dump(struct ksz_device *dev, int port, |