From nobody Tue May 31 10:13:33 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9417A1B471EE; Tue, 31 May 2022 10:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LC7Qj3YCvz3DW1; Tue, 31 May 2022 10:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653992013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5pbB/Av/67WGaSoR0VfnL41P78+5ftwW0BBgd+1Quw=; b=EgsB7O46uDQhviQsHQWTmQM/JWCGWnyRPd6SUQRrug4/UJW6ipsxnR6kAfs1JHDHEHSku5 f0V4vvrK2sLVrllBw6taKdcnbVMQuOEhE8TSPRebdJWQLm/rH/RVo+LZMxZmKloyHRSiJM qgkr9h0BVDDdJ0zf3+sOdtnOifBSK2V+9x9zfS7ockN+wuI+FQJ0gtw4DGXmTAc/zdtArt lQB4rTaNoJjcvaD7bQ6NF0Hf7tneUzIsYq+/iESsEeIj+08dmA8sR75dFrxap4mG8TTTNu sQHfW58Bo5TGiXipy8Z8qEwwxmjWlwvFWlp+J314WCNKY/CgRWoWYMLDn8xFgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A1C51BA1; Tue, 31 May 2022 10:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24VADXRE056406; Tue, 31 May 2022 10:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24VADXnJ056405; Tue, 31 May 2022 10:13:33 GMT (envelope-from git) Date: Tue, 31 May 2022 10:13:33 GMT Message-Id: <202205311013.24VADXnJ056405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 0b666a7c13f6 - stable/13 - net: remove incorrect assertions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b666a7c13f6512ced2a1ff253c1e0457c529e87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653992013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5pbB/Av/67WGaSoR0VfnL41P78+5ftwW0BBgd+1Quw=; b=wKj1HlVvC3j0YM1PD/d2MGi2iGEM+xt5pmcNSpeeQKiGYS++MrXYXDOIB5V5aRUqHfqtqO 1Y2fE8BJhIsmbKET3kFUUlyZvpL7xafVuUuKP54RKg4IBwal/z8hEqNkTCY8t0oz1eNKdn vjKxdfWb91Ja2bn6HnibivDJMSi4yiUT4+3967JSt/YZ4xCfcW6PGF442QBv66Qmvs88QO sK3GLOgoXz/4X3dVhTEg7GtN7VIX1K/dLOxiB4vOtcEMW0qO5IHSCNuTBiASjixv+Tr8Yb ZB+4qB9v2iiriqmAWRGgw3gpNw3PqgSmpGtx3GisfrKcsaUbcdREdvrcszrl8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653992013; a=rsa-sha256; cv=none; b=F7HlOWgG47bOTfH8Yke7ef25KrRdH+B4nJeJHX2WmigmNHXeHXfspt/v6hbyx9sYU/KJ/s MJB/i13Ir7GubQsQqBaerrUCbAXsbmdIln9xOFTmgZIJes8O3pCR+TaBzRsMwphruKcxQa hyIi4Td/kmXK2Fv1PQF3TJImpcw6n5Hi/PFb+Kuge0oTdFeg7Z5slHTk7mc3EtOlhb33lx UmU43VPpzzD8tth9tEfnCZmJ4s3g2d1gJ40QSj1xYXujb1znpgvbQASwGktOxqdGSrOSsw F/l5C5OqJyK5a3m6F+pegB0BOYBtC5O2/pyElp5V7E/EYoYxlsEssZC3feFq/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b666a7c13f6512ced2a1ff253c1e0457c529e87 commit 0b666a7c13f6512ced2a1ff253c1e0457c529e87 Author: Kristof Provost AuthorDate: 2022-05-31 10:02:01 +0000 Commit: Kristof Provost 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 --- 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);