diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-04-26 12:04:45 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-04-26 12:04:46 +0200 |
| commit | fc48de77d69de9d453cae3bb911f016a4be1bbda (patch) | |
| tree | f8960c7e7e072365880039cc7957b5de264e9ec2 /net/hsr/hsr_slave.c | |
| parent | af0cb3fa3f9ed258d14abab0152e28a0f9593084 (diff) | |
| parent | 542e645c4a4d7dc9a6ef6bbf0e4249fc113728d1 (diff) | |
Merge branch 'net-hsr-add-support-for-hsr-san-redbox'
Lukasz Majewski says:
====================
net: hsr: Add support for HSR-SAN (RedBOX)
This patch set provides v6 of HSR-SAN (RedBOX) as well as hsr_redbox.sh
test script.
The most straightforward way to test those patches is to use buildroot
(2024.02.01) to create rootfs and QEMU based environment to run x86_64
Linux.
Then one shall run hsr_redbox.sh and hsr_ping.sh from
tools/testing/selftests/net/hsr.
====================
Link: https://lore.kernel.org/r/20240423124908.2073400-1-lukma@denx.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/hsr/hsr_slave.c')
| -rw-r--r-- | net/hsr/hsr_slave.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index 1b6457f357bd..af6cf64a00e0 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c @@ -55,6 +55,7 @@ static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb) protocol = eth_hdr(skb)->h_proto; if (!(port->dev->features & NETIF_F_HW_HSR_TAG_RM) && + port->type != HSR_PT_INTERLINK && hsr->proto_ops->invalid_dan_ingress_frame && hsr->proto_ops->invalid_dan_ingress_frame(protocol)) goto finish_pass; |