]> git.dujemihanovic.xyz Git - linux.git/commitdiff
net: hsr: Remove interlink_sequence_nr.
authorEric Dumazet <edumazet@google.com>
Fri, 6 Sep 2024 13:25:32 +0000 (15:25 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 11 Sep 2024 22:49:07 +0000 (15:49 -0700)
Remove interlink_sequence_nr which is unused.

[ bigeasy: split out from Eric's patch ].

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://patch.msgid.link/20240906132816.657485-3-bigeasy@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/hsr/hsr_device.c
net/hsr/hsr_main.h

index a06e790042e2e0832fb1ecda65fbd8f9d5dbc3df..10393836992df56a32d8b0aa46cbbdd43b317f60 100644 (file)
@@ -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);
index ab1f8d35d9dcf507f0b2f90b0cede6dd24a51f2a..fcfeb79bb04018f3a84be3e24f29c6b92f2d8be1 100644 (file)
@@ -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 */