From 416a1d1e702553c0ff29c08b912d77b3d927184f Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Mon, 14 Oct 2019 21:18:37 +0000 Subject: [PATCH] if_delmulti() is never called without ifp argument, assert this instead of doing a useless search through interfaces. --- sys/net/if.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 9610fd69ecb6..1d19b1cf9de1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -3614,21 +3614,8 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa) { struct ifmultiaddr *ifma; int lastref; -#ifdef INVARIANTS - struct ifnet *oifp; - NET_EPOCH_ASSERT(); - - CK_STAILQ_FOREACH(oifp, &V_ifnet, if_link) - if (ifp == oifp) - break; - if (ifp != oifp) - ifp = NULL; - - KASSERT(ifp != NULL, ("%s: ifnet went away", __func__)); -#endif - if (ifp == NULL) - return (ENOENT); + KASSERT(ifp, ("%s: NULL ifp", __func__)); IF_ADDR_WLOCK(ifp); lastref = 0;