From c652a4cf8275c3dd8784602ead449a3f96a09663 Mon Sep 17 00:00:00 2001 From: ae Date: Wed, 8 Aug 2018 16:09:28 +0000 Subject: [PATCH] MFC r336405: Move invoking of callout_stop(&lle->lle_timer) into llentry_free(). This deduplicates the code a bit, and also implicitly adds missing callout_stop() to in[6]_lltable_delete_entry() functions. PR: 209682, 225927 --- sys/net/if_llatbl.c | 5 +++-- sys/netinet/in.c | 4 ---- sys/netinet6/in6.c | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index 8b9edc668fd..47cb7c809d5 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -429,6 +429,9 @@ llentry_free(struct llentry *lle) pkts_dropped = lltable_drop_entry_queue(lle); + /* cancel timer */ + if (callout_stop(&lle->lle_timer) > 0) + LLE_REMREF(lle); LLE_FREE_LOCKED(lle); return (pkts_dropped); @@ -515,8 +518,6 @@ lltable_free(struct lltable *llt) IF_AFDATA_WUNLOCK(llt->llt_ifp); LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) { - if (callout_stop(&lle->lle_timer) > 0) - LLE_REMREF(lle); llentry_free(lle); } diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 3ef8facd01d..3cdc528c166 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1145,10 +1145,6 @@ in_lltable_free_entry(struct lltable *llt, struct llentry *lle) lltable_unlink_entry(llt, lle); } - /* cancel timer */ - if (callout_stop(&lle->lle_timer) > 0) - LLE_REMREF(lle); - /* Drop hold queue */ pkts_dropped = llentry_free(lle); ARPSTAT_ADD(dropped, pkts_dropped); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 62fde9814e2..ea95e119655 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2107,9 +2107,6 @@ in6_lltable_free_entry(struct lltable *llt, struct llentry *lle) lltable_unlink_entry(llt, lle); } - if (callout_stop(&lle->lle_timer) > 0) - LLE_REMREF(lle); - llentry_free(lle); }