Date: Tue, 31 May 2022 10:13:33 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0b666a7c13f6 - stable/13 - net: remove incorrect assertions Message-ID: <202205311013.24VADXnJ056405@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b666a7c13f6512ced2a1ff253c1e0457c529e87 commit 0b666a7c13f6512ced2a1ff253c1e0457c529e87 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2022-05-31 10:02:01 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2022-05-31 10:02:01 +0000 net: remove incorrect assertions This assertion relies on the 80e60e236d85d change ("ifnet: make if_index global"), which is not present in stable/13. This fixes the LINT build (and any configuration with INVARIANTS) Reported by: Dimitry Andric <dim@FreeBSD.org> --- sys/net/if.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 091e9e64b99f..b8aadbf03041 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1395,8 +1395,6 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) bool found; bool shutdown; - MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); - /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); pr = prison_find_child(td->td_ucred->cr_prison, jid); @@ -2414,7 +2412,6 @@ ifunit_ref(const char *name) } if (ifp != NULL) { if_ref(ifp); - MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); } NET_EPOCH_EXIT(et);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205311013.24VADXnJ056405>