Jakub Kicinski 46ae4d0a48 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

No conflicts (sort of) and no adjacent changes.

This merge reverts commit b3c9e65eb2 ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bdcb ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-09-12 17:11:24 -07:00

..

hsr_debugfs.c

Revert "net: hsr: use hlist_head instead of list_head for mac addresses"

2022-12-01 20:26:20 -08:00

hsr_device.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-09-12 17:11:24 -07:00

hsr_device.h

net: hsr: Provide RedBox support (HSR-SAN)

2024-04-26 12:04:43 +02:00

hsr_forward.c

net: hsr: remove seqnr_lock

2024-09-09 10:25:01 +01:00

hsr_forward.h

net: hsr: fix mac_len checks

2021-05-24 14:10:28 -07:00

hsr_framereg.c

net: hsr: Send supervisory frames to HSR network with ProxyNodeTable data

2024-06-14 08:21:46 +01:00

hsr_framereg.h

net: hsr: Send supervisory frames to HSR network with ProxyNodeTable data

2024-06-14 08:21:46 +01:00

hsr_main.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

hsr_main.h

net: hsr: Remove interlink_sequence_nr.

2024-09-11 15:49:07 -07:00

hsr_netlink.c

net: hsr: remove seqnr_lock

2024-09-09 10:25:01 +01:00

hsr_netlink.h

net/hsr: Remove unused function declarations

2023-07-31 20:11:47 -07:00

hsr_slave.c

net: hsr: Use the seqnr lock for frames received via interlink port.

2024-09-11 15:49:07 -07:00

hsr_slave.h

net: prp: add packet handling support

2020-07-27 12:20:40 -07:00

Kconfig

hsr: enhance netlink socket interface to support PRP

2020-07-27 12:20:40 -07:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00