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
..
6lowpan	6lowpan: iphc: Fix an off-by-one check of array index	2021-07-22 16:19:03 +02:00
9p	net/9p: fix bug in client create for .L	2023-03-22 13:31:31 +01:00
802	mrp: introduce active flags to prevent UAF when applicant uninit	2022-12-31 13:14:42 +01:00
8021q	net: use eth_hw_addr_set() instead of ether_addr_copy()	2022-08-31 17:16:37 +02:00
appletalk	net: socket: rework compat_ifreq_ioctl()	2021-07-23 14:20:25 +01:00
atm	net/atm: fix proc_mpc_write incorrect return value	2022-10-29 10:12:55 +02:00
ax25	net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg	2022-06-22 14:22:01 +02:00
batman-adv	batman-adv: Use netif_rx_any_context() any.	2022-07-29 17:25:07 +02:00
bluetooth	Bluetooth: L2CAP: Fix responding with wrong PDU type	2023-03-30 12:47:50 +02:00
bpf	bpf: Move skb->len == 0 checks into __bpf_redirect	2022-12-31 13:14:11 +01:00
bpfilter	bpfilter: Specify the log level for the kmsg message	2021-06-25 13:13:50 +02:00
bridge	netfilter: ebtables: fix table blob use-after-free	2023-03-11 13:57:28 +01:00
caif	net: caif: Fix use-after-free in cfusbl_device_notify()	2023-03-17 08:48:54 +01:00
can	can: j1939: prevent deadlock by moving j1939_sk_errqueue()	2023-04-05 11:24:59 +02:00
ceph	libceph: fix potential use-after-free on linger ping and resends	2022-05-25 09:57:28 +02:00
core	net: fix __dev_kfree_skb_any() vs drop monitor	2023-03-11 13:57:28 +01:00
dcb	net: dcb: disable softirqs in dcbnl_flush_dev()	2022-03-08 19:12:52 +01:00
dccp	dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.	2023-02-22 12:57:08 +01:00
decnet	net: Fix data-races around sysctl_[rw]mem(_offset)?.	2022-08-03 12:03:51 +02:00
dns_resolver	…
dsa	net: dsa: tag_brcm: legacy: fix daisy-chained switches	2023-03-30 12:47:48 +02:00
ethernet	move netdev_boot_setup into Space.c	2021-08-03 13:05:26 +01:00
ethtool	net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats	2023-01-24 07:22:41 +01:00
hsr	hsr: ratelimit only when errors are printed	2023-04-05 11:25:02 +02:00
ieee802154	net: ieee802154: fix error return code in dgram_bind()	2022-11-03 23:59:14 +09:00
ife	…
ipv4	erspan: do not use skb_mac_header() in ndo_start_xmit()	2023-03-30 12:47:48 +02:00
ipv6	erspan: do not use skb_mac_header() in ndo_start_xmit()	2023-03-30 12:47:48 +02:00
iucv	net/iucv: Fix size of interrupt data	2023-03-22 13:31:28 +01:00
kcm	kcm: close race conditions on sk_receive_queue	2022-11-26 09:24:50 +01:00
key	xfrm: Fix oops in __xfrm_state_delete()	2022-12-02 17:41:06 +01:00
l2tp	l2tp: Avoid possible recursive deadlock in l2tp_tunnel_register()	2023-03-10 09:39:18 +01:00
l3mdev	l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu	2022-04-27 14:38:53 +02:00
lapb	net: lapb: Use list_for_each_entry() to simplify code in lapb_iface.c	2021-06-08 16:31:25 -07:00
llc	llc: only change llc->dev when bind() succeeds	2022-03-28 09:58:46 +02:00
mac80211	wifi: mac80211: fix qos on mesh interfaces	2023-03-30 12:47:58 +02:00
mac802154	mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add()	2022-12-14 11:37:25 +01:00
mctp	net: mctp: purge receive queues on sk destruction	2023-02-06 07:59:02 +01:00
mpls	net: mpls: fix stale pointer if allocation fails during device rename	2023-02-22 12:57:09 +01:00
mptcp	mptcp: fix lockdep false positive in mptcp_pm_nl_create_listen_socket()	2023-03-22 13:31:35 +01:00
ncsi	net/ncsi: check for error return from call to nla_put_u32	2022-01-05 12:42:37 +01:00
netfilter	netfilter: nft_redir: correct value of inet type `.maxattrs`	2023-03-22 13:31:23 +01:00
netlabel	netlabel: fix out-of-bounds memory accesses	2022-04-13 20:59:10 +02:00
netlink	netlink: annotate data races around sk_state	2023-02-01 08:27:27 +01:00
netrom	netrom: Fix use-after-free caused by accept on already connected socket	2023-02-09 11:26:36 +01:00
nfc	nfc: change order inside nfc_se_io error path	2023-03-17 08:48:49 +01:00
nsh	…
openvswitch	net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()	2023-02-22 12:57:09 +01:00
packet	net/af_packet: make sure to pull mac header	2023-01-12 11:58:49 +01:00
phonet	phonet: refcount leak in pep_sock_accep	2022-01-11 15:35:16 +01:00
psample	…
qrtr	net: qrtr: free memory on error path in radix_tree_insert()	2023-02-09 11:26:41 +01:00
rds	rds: rds_rm_zerocopy_callback() correct order for list_add_tail()	2023-03-10 09:39:16 +01:00
rfkill	rfkill: make new event layout opt-in	2022-04-08 14:23:00 +02:00
rose	net/rose: Fix to not accept on connected socket	2023-02-22 12:57:02 +01:00
rxrpc	rxrpc: Fix missing unlock in rxrpc_do_sendmsg()	2022-12-31 13:14:39 +01:00
sched	act_mirred: use the backlog for nested calls to mirred ingress	2023-03-30 12:47:55 +02:00
sctp	sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop	2023-03-11 13:57:28 +01:00
smc	net/smc: fix deadlock triggered by cancel_delayed_work_syn()	2023-03-22 13:31:26 +01:00
strparser	bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding	2021-11-18 19:17:11 +01:00
sunrpc	SUNRPC: fix shutdown of NFS TCP client socket	2023-04-05 11:24:55 +02:00
switchdev	net: make switchdev_bridge_port_{,unoffload} loosely coupled with the bridge	2021-08-04 12:35:07 +01:00
tipc	tipc: fix unexpected link reset due to discovery messages	2023-01-18 11:48:54 +01:00
tls	net: tls: fix possible race condition between do_tls_getsockopt_conf() and do_tls_setsockopt_conf()	2023-03-30 12:47:43 +02:00
unix	af_unix: fix struct pid leaks in OOB support	2023-03-17 08:48:57 +01:00
vmw_vsock	net: vmw_vsock: vmci: Check memcpy_from_msg()	2022-12-31 13:14:18 +01:00
wireless	wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext"	2023-03-13 10:20:37 +01:00
x25	net/x25: Fix to not accept on connected socket	2023-02-09 11:26:40 +01:00
xdp	xsk: Add missing overflow check in xdp_umem_reg	2023-03-30 12:47:44 +02:00
xfrm	xfrm: Zero padding when dumping algos and encap	2023-04-05 11:24:52 +02:00
Kconfig	mctp: Add MCTP base	2021-07-29 15:06:49 +01:00
Makefile	mctp: Add MCTP base	2021-07-29 15:06:49 +01:00
compat.c	net: Return the correct errno code	2021-06-03 15:13:56 -07:00
devres.c	net: devres: Correct a grammatical error	2021-06-11 12:55:28 -07:00
socket.c	net: Fix a data-race around sysctl_somaxconn.	2022-08-31 17:16:45 +02:00
sysctl_net.c	net: Ensure net namespace isolation of sysctls	2021-04-12 13:27:11 -07:00