| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- From 072eea6c22b2af680c3949e64f9adde278c71e68 Mon Sep 17 00:00:00 2001
- From: "Russell King (Oracle)" <[email protected]>
- Date: Tue, 30 Nov 2021 13:10:01 +0000
- Subject: [PATCH] net: dsa: replace phylink_get_interfaces() with
- phylink_get_caps()
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Phylink needs slightly more information than phylink_get_interfaces()
- allows us to get from the DSA drivers - we need the MAC capabilities.
- Replace the phylink_get_interfaces() method with phylink_get_caps() to
- allow DSA drivers to fill in the phylink_config MAC capabilities field
- as well.
- Signed-off-by: Russell King (Oracle) <[email protected]>
- Reviewed-by: Marek Behún <[email protected]>
- Reviewed-by: Andrew Lunn <[email protected]>
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- include/net/dsa.h | 4 ++--
- net/dsa/port.c | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
- --- a/include/net/dsa.h
- +++ b/include/net/dsa.h
- @@ -654,8 +654,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);
- --- a/net/dsa/port.c
- +++ b/net/dsa/port.c
- @@ -1111,9 +1111,8 @@ int dsa_port_phylink_create(struct dsa_p
- if (err)
- mode = PHY_INTERFACE_MODE_NA;
-
- - if (ds->ops->phylink_get_interfaces)
- - ds->ops->phylink_get_interfaces(ds, dp->index,
- - dp->pl_config.supported_interfaces);
- + if (ds->ops->phylink_get_caps)
- + ds->ops->phylink_get_caps(ds, dp->index, &dp->pl_config);
-
- dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn),
- mode, &dsa_port_phylink_mac_ops);
|
