summaryrefslogtreecommitdiffstats
path: root/include/soc
diff options
context:
space:
mode:
authorHoratiu Vultur <horatiu.vultur@microchip.com>2021-03-16 21:10:18 +0100
committerDavid S. Miller <davem@davemloft.net>2021-03-16 23:49:52 +0100
commit7c588c3e96e9733a2a8a40caefd26c9189416821 (patch)
treed7ea2cbf49c6c8fe053266a954bfc7764724580e /include/soc
parentnet: ocelot: Add PGID_BLACKHOLE (diff)
downloadlinux-7c588c3e96e9733a2a8a40caefd26c9189416821.tar.xz
linux-7c588c3e96e9733a2a8a40caefd26c9189416821.zip
net: ocelot: Extend MRP
This patch extends MRP support for Ocelot. It allows to have multiple rings and when the node has the MRC role it forwards MRP Test frames in HW. For MRM there is no change. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/mscc/ocelot.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 4d10ccc8e7b5..0a0751bf97dd 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -613,6 +613,8 @@ struct ocelot_port {
struct net_device *bond;
bool lag_tx_active;
+
+ u16 mrp_ring_id;
};
struct ocelot {
@@ -681,12 +683,6 @@ struct ocelot {
/* Protects the PTP clock */
spinlock_t ptp_clock_lock;
struct ptp_pin_desc ptp_pins[OCELOT_PTP_PINS_NUM];
-
-#if IS_ENABLED(CONFIG_BRIDGE_MRP)
- u16 mrp_ring_id;
- struct net_device *mrp_p_port;
- struct net_device *mrp_s_port;
-#endif
};
struct ocelot_policer {