From acf673edf06f1f40157a151ac815691ca17d0b2d Mon Sep 17 00:00:00 2001 From: "Andrey V. Elsukov" Date: Tue, 17 Jul 2018 11:33:23 +0000 Subject: [PATCH] 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 Submitted by: hselasky (previous version) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D4605 --- 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 a157520120c8..733e1634f7d4 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -436,6 +436,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); @@ -522,8 +525,6 @@ lltable_free(struct lltable *llt) IF_AFDATA_WUNLOCK(llt->llt_ifp); CK_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 995b7517ed63..a3c5338f4dbf 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1165,10 +1165,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 1dfee62eb082..82eb08fb505e 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2135,9 +2135,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); }