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 /net/dsa | |
| parent | net: ocelot: Add PGID_BLACKHOLE (diff) | |
| download | linux-7c588c3e96e9733a2a8a40caefd26c9189416821.tar.gz linux-7c588c3e96e9733a2a8a40caefd26c9189416821.tar.bz2 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 'net/dsa')
| -rw-r--r-- | net/dsa/tag_ocelot.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c index 743809b5806b..157f95689d8d 100644 --- a/net/dsa/tag_ocelot.c +++ b/net/dsa/tag_ocelot.c @@ -128,12 +128,6 @@ static struct sk_buff *ocelot_rcv(struct sk_buff *skb, skb->offload_fwd_mark = 1; skb->priority = qos_class; -#if IS_ENABLED(CONFIG_BRIDGE_MRP) - if (eth_hdr(skb)->h_proto == cpu_to_be16(ETH_P_MRP) && - cpuq & BIT(OCELOT_MRP_CPUQ)) - skb->offload_fwd_mark = 0; -#endif - /* Ocelot switches copy frames unmodified to the CPU. However, it is * possible for the user to request a VLAN modification through * VCAP_IS1_ACT_VID_REPLACE_ENA. In this case, what will happen is that |