From: Eric Dumazet Date: Fri, 6 Sep 2024 13:25:32 +0000 (+0200) Subject: net: hsr: Remove interlink_sequence_nr. X-Git-Tag: v6.12-rc1~232^2~40^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35e24f28c2e9b2c3b711200b07e4f9926f464c6b;p=thirdparty%2Flinux.git net: hsr: Remove interlink_sequence_nr. Remove interlink_sequence_nr which is unused. [ bigeasy: split out from Eric's patch ]. Signed-off-by: Eric Dumazet Signed-off-by: Sebastian Andrzej Siewior Link: https://patch.msgid.link/20240906132816.657485-3-bigeasy@linutronix.de Signed-off-by: Jakub Kicinski --- diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index a06e790042e2e..10393836992df 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -625,7 +625,6 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], /* Overflow soon to find bugs easier: */ hsr->sequence_nr = HSR_SEQNR_START; hsr->sup_sequence_nr = HSR_SUP_SEQNR_START; - hsr->interlink_sequence_nr = HSR_SEQNR_START; timer_setup(&hsr->announce_timer, hsr_announce, 0); timer_setup(&hsr->prune_timer, hsr_prune_nodes, 0); diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index ab1f8d35d9dcf..fcfeb79bb0401 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -203,7 +203,6 @@ struct hsr_priv { struct timer_list prune_proxy_timer; int announce_count; u16 sequence_nr; - u16 interlink_sequence_nr; /* Interlink port seq_nr */ u16 sup_sequence_nr; /* For HSRv1 separate seq_nr for supervision */ enum hsr_version prot_version; /* Indicate if HSRv0, HSRv1 or PRPv1 */ spinlock_t seqnr_lock; /* locking for sequence_nr */