diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 12 | ||||
| -rw-r--r-- | include/linux/phylink.h | 8 | ||||
| -rw-r--r-- | include/linux/sfp.h | 4 | ||||
| -rw-r--r-- | include/net/dsa.h | 11 |
4 files changed, 11 insertions, 24 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index ded6ce314710..547098e9a98c 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -810,9 +810,9 @@ struct phy_tdr_config { /** * enum link_inband_signalling - inband signalling modes that are supported * - * @LINK_INBAND_VALID: inband signalling report is valid - * @LINK_INBAND_POSSIBLE: inband signalling can be used - * @LINK_INBAND_REQUIRED: inband signalling is required + * @LINK_INBAND_DISABLE: inband signalling can be disabled + * @LINK_INBAND_ENABLE: inband signalling can be enabled + * @LINK_INBAND_BYPASS: only valid with LINK_INBAND_ENABLE and supports bypass * * The possible and required bits can only be used if the valid bit is set. * If possible is clear, that means inband signalling can not be used. @@ -820,9 +820,9 @@ struct phy_tdr_config { * signalling must be used. */ enum link_inband_signalling { - LINK_INBAND_VALID = BIT(0), - LINK_INBAND_POSSIBLE = BIT(1), - LINK_INBAND_REQUIRED = BIT(2), + LINK_INBAND_DISABLE = BIT(0), + LINK_INBAND_ENABLE = BIT(1), + LINK_INBAND_BYPASS = BIT(2), }; /** diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 8664b3442a3a..40324cdb4353 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -472,8 +472,7 @@ struct phylink_pcs { * (where necessary). */ struct phylink_pcs_ops { - int (*pcs_validate)(struct phylink_pcs *pcs, unsigned int mode, - unsigned long *supported, + int (*pcs_validate)(struct phylink_pcs *pcs, unsigned long *supported, const struct phylink_link_state *state); unsigned int (*pcs_query_inband)(struct phylink_pcs *pcs, phy_interface_t interface); @@ -498,7 +497,6 @@ struct phylink_pcs_ops { /** * pcs_validate() - validate the link configuration. * @pcs: a pointer to a &struct phylink_pcs. - * @mode: link autonegotiation mode * @supported: ethtool bitmask for supported link modes. * @state: a const pointer to a &struct phylink_link_state. * @@ -510,8 +508,8 @@ struct phylink_pcs_ops { * Returns -EINVAL if the interface mode/autoneg mode is not supported. * Returns non-zero positive if the link state can be supported. */ -int pcs_validate(struct phylink_pcs *pcs, unsigned int mode, - unsigned long *supported, struct phylink_link_state *state); +int pcs_validate(struct phylink_pcs *pcs, unsigned long *supported, + const struct phylink_link_state *state); /** * pcs_query_inband - query inband support for interface mode. diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 9346cd44814d..a45da7eef9a2 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -554,7 +554,7 @@ bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id); void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id, unsigned long *support, unsigned long *interfaces); phy_interface_t sfp_select_interface(struct sfp_bus *bus, - unsigned long *link_modes); + const unsigned long *link_modes); int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo); int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, @@ -592,7 +592,7 @@ static inline void sfp_parse_support(struct sfp_bus *bus, } static inline phy_interface_t sfp_select_interface(struct sfp_bus *bus, - unsigned long *link_modes) + const unsigned long *link_modes) { return PHY_INTERFACE_MODE_NA; } diff --git a/include/net/dsa.h b/include/net/dsa.h index 340f04d21cd1..627d13ed649b 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -24,9 +24,6 @@ struct dsa_8021q_context; struct tc_action; -struct phy_device; -struct fixed_phy_status; -struct phylink_link_state; #define DSA_TAG_PROTO_NONE_VALUE 0 #define DSA_TAG_PROTO_BRCM_VALUE 1 @@ -869,14 +866,6 @@ struct dsa_switch_ops { int regnum, u16 val); /* - * Link state adjustment (called from libphy) - */ - void (*adjust_link)(struct dsa_switch *ds, int port, - struct phy_device *phydev); - void (*fixed_link_update)(struct dsa_switch *ds, int port, - struct fixed_phy_status *st); - - /* * PHYLINK integration */ void (*phylink_get_caps)(struct dsa_switch *ds, int port, |