Matthieu Baerts 3abdf6d71f hsr: ratelimit only when errors are printed ... commit 1b0120e4db upstream. Recently, when automatically merging -net and net-next in MPTCP devel tree, our CI reported [1] a conflict in hsr, the same as the one reported by Stephen in netdev [2]. When looking at the conflict, I noticed it is in fact the v1 [3] that has been applied in -net and the v2 [4] in net-next. Maybe the v1 was applied by accident. As mentioned by Jakub Kicinski [5], the new condition makes more sense before the net_ratelimit(), not to update net_ratelimit's state which is unnecessary if we're not going to print either way. Here, this modification applies the v2 but in -net. Link: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/4423171069 [1] Link: https://lore.kernel.org/netdev/20230315100914.53fc1760@canb.auug.org.au/ [2] Link: https://lore.kernel.org/netdev/20230307133229.127442-1-koverskeid@gmail.com/ [3] Link: https://lore.kernel.org/netdev/20230309092302.179586-1-koverskeid@gmail.com/ [4] Link: https://lore.kernel.org/netdev/20230308232001.2fb62013@kernel.org/ [5] Fixes: 28e8cabe80 ("net: hsr: Don't log netdev_err message on unknown prp dst node") Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com> Link: https://lore.kernel.org/r/20230315-net-20230315-hsr_framereg-ratelimit-v1-1-61d2ef176d11@tessares.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2023-04-05 11:25:02 +02: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
hsr_debugfs.c	/net/hsr: fix misspellings using codespell tool	2021-03-18 19:13:41 -07:00
hsr_device.c	hsr: Synchronize sending frames to have always incremented outgoing seq nr.	2022-12-31 13:14:15 +01:00
hsr_device.h	net: hsr: add offloading support	2021-02-11 13:24:44 -08:00
hsr_forward.c	hsr: Synchronize sending frames to have always incremented outgoing seq nr.	2022-12-31 13:14:15 +01:00
hsr_forward.h	net: hsr: fix mac_len checks	2021-05-24 14:10:28 -07:00
hsr_framereg.c	hsr: ratelimit only when errors are printed	2023-04-05 11:25:02 +02:00
hsr_framereg.h	hsr: Synchronize sequence number updates.	2022-12-31 13:14:15 +01:00
hsr_main.c	net: use eth_hw_addr_set() instead of ether_addr_copy()	2022-08-31 17:16:37 +02:00
hsr_main.h	net: hsr: fix mac_len checks	2021-05-24 14:10:28 -07:00
hsr_netlink.c	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
hsr_netlink.h	hsr: enhance netlink socket interface to support PRP	2020-07-27 12:20:40 -07:00
hsr_slave.c	net: hsr: fix mac_len checks	2021-05-24 14:10:28 -07:00
hsr_slave.h	net: prp: add packet handling support	2020-07-27 12:20:40 -07:00