diff options
| author | Horatiu Vultur <horatiu.vultur@microchip.com> | 2021-03-16 21:10:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-16 15:49:52 -0700 |
| commit | 7c588c3e96e9733a2a8a40caefd26c9189416821 (patch) | |
| tree | d7ea2cbf49c6c8fe053266a954bfc7764724580e /drivers/net/ethernet/mscc/ocelot.c | |
| parent | ebb1bb401303ffac0ee994ba8ed9dfd24bb2ac5f (diff) | |
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 'drivers/net/ethernet/mscc/ocelot.c')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index f74d7cf002a5..9cc9378157e4 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -772,12 +772,6 @@ int ocelot_xtr_poll_frame(struct ocelot *ocelot, int grp, struct sk_buff **nskb) skb->protocol = eth_type_trans(skb, dev); -#if IS_ENABLED(CONFIG_BRIDGE_MRP) - if (skb->protocol == cpu_to_be16(ETH_P_MRP) && - cpuq & BIT(OCELOT_MRP_CPUQ)) - skb->offload_fwd_mark = 0; -#endif - *nskb = skb; return 0; |