diff options
| author | Jakub Kicinski | 2022-05-12 16:39:21 -0700 |
|---|---|---|
| committer | Jakub Kicinski | 2022-05-12 16:39:22 -0700 |
| commit | 75db72de1f744f8fe1e4eb8da4c305741d02c52f (patch) | |
| tree | c6a4f19010382f197987d8b2d2ccda663c9596d2 /include | |
| parent | 879c610c924fef47e27ae926539594a4d080affd (diff) | |
| parent | 7e708760fc114f049df9dccb994e23d20866b310 (diff) | |
Merge branch 'restructure-struct-ocelot_port'
Vladimir Oltean says:
====================
Restructure struct ocelot_port
This patch set represents preparation for further work. It adds an
"index" field to struct ocelot_port, and populates it from the Felix DSA
driver and Ocelot switchdev driver.
The users of struct ocelot_port :: index are the same users as those of
struct ocelot_port_private :: chip_port.
====================
Link: https://lore.kernel.org/r/20220511100637.568950-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/mscc/ocelot.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index e88bcfe4b2cd..3b8c5a54fb00 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -659,29 +659,32 @@ struct ocelot_port { struct regmap *target; - bool vlan_aware; + struct net_device *bond; + struct net_device *bridge; + /* VLAN that untagged frames are classified to, on ingress */ const struct ocelot_bridge_vlan *pvid_vlan; + phy_interface_t phy_mode; + unsigned int ptp_skbs_in_flight; - u8 ptp_cmd; struct sk_buff_head tx_skbs; + + u16 mrp_ring_id; + + u8 ptp_cmd; u8 ts_id; - phy_interface_t phy_mode; + u8 index; - u8 *xmit_template; + u8 stp_state; + bool vlan_aware; bool is_dsa_8021q_cpu; bool learn_ena; - struct net_device *bond; bool lag_tx_active; - u16 mrp_ring_id; - - struct net_device *bridge; int bridge_num; - u8 stp_state; int speed; }; |