diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-01 18:58:03 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-01 18:58:03 -0800 |
| commit | 4a8e4640ddd1e18cade9f15e40f2d8cd65f173cf (patch) | |
| tree | cc245a61fb2ed6b91bdb6fbde6052b4b0cd09fc7 /include/net/dsa.h | |
| parent | 8057cbb8335cf6d419866737504473833e1d128a (diff) | |
| parent | a2279b08c7f4c97ad93916dae5c02eeac34b7f2c (diff) | |
Merge branch 'net-dsa-convert-two-drivers-to-phylink_generic_validate'
Russell King says:
====================
net: dsa: convert two drivers to phylink_generic_validate()
Patches 1 to 3 update core DSA code to allow drivers to be converted,
and patches 4 and 5 convert hellcreek and lantiq to use this (both of
which received reviewed-by from their maintainers.) As the rest have
yet to be reviewed by their maintainers, they are not included here.
Patch 1 had a request to change the formatting of it; I have not done
so as I believe a patch should do one change and one change only -
reformatting it is a separate change that should be in its own patch.
However, as patch 2 gets rid of the reason for reformatting it, it
would be pointless, and pure noise to include such an intermediary
patch.
Instead, I have swapped the order of patches 2 and 3 from the RFC
series.
====================
Link: https://lore.kernel.org/r/YaYiiU9nvmVugqnJ@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index eff5c44ba377..8ca9d50cbbc2 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -645,8 +645,8 @@ struct dsa_switch_ops { /* * PHYLINK integration */ - void (*phylink_get_interfaces)(struct dsa_switch *ds, int port, - unsigned long *supported_interfaces); + void (*phylink_get_caps)(struct dsa_switch *ds, int port, + struct phylink_config *config); void (*phylink_validate)(struct dsa_switch *ds, int port, unsigned long *supported, struct phylink_link_state *state); |