From nobody Mon Feb 6 17:53:54 2023 X-Original-To: dev-commits-src-main@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 4P9Ym23tmXz3n0TS; Mon, 6 Feb 2023 17:53:54 +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 4P9Ym23HTLz4X0d; Mon, 6 Feb 2023 17:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675706034; 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=1xqVUJu1M2QrMVTAd1JHpS9w/1/Tm3jrsnPbeOS0uew=; b=GyFXOo2FYghmIBHyTgyE+gdvg9egDuO0Ew1kNJJEXamBLylInQQIDy2kYSciwenBaish4y gEhr5SECl8YGZK6gFqBkjTTS47UJGH54o6utISrIJhyaoghIlZ8++nFevHYtXjs0JPFL3W TY3xzI/4CUgUsS4SWaY7fXHcRNAdHmJbZ+uaLI1DRku0UeL/M8l48cVl4BsiDEANQ4OL/t 4mHEohpdOWSxYh2lKtDJaK1SBLI1vSylIee74bcS9kv40+pu+ZcB4LlpY+TBnVLVjWb831 hLC4NPgiTlVzC/58HSrc1mTHkuWQzvGg9olv0JF6i6UMxn4jN/ZHhjFFK1amKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675706034; 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=1xqVUJu1M2QrMVTAd1JHpS9w/1/Tm3jrsnPbeOS0uew=; b=s6FMBzf9RevZc/8oYX6YNjJgHLdmnwsSkJh6PA0JDNNjNzPnzwoKPZULPrDP93G7KeaPka FMktFEtRXDJc7EnDJRAHdM/GJpY2Mh2HqC01L/Req77g0Gk8IJ5REHPPyk9+uXHW1DiZUx Fc6WU4TIhCtTHg+LCRz4WxNUsGnpF9TApn3P13CWiLZqoTKZuFgnbMwNlN5MbbTmOSFgff gpQZt0gJhL/4Hl469+5geEvjcUwYbr9bSGv4151tOa2bC6d4XFZzKexgw+c1DSbLNcOhGv tO/NygtS/Yjm1tS5WnOQ5tFtFeSXwSDdJTDbWWRiqRvKx8VkMHeUtYLp1BGhQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675706034; a=rsa-sha256; cv=none; b=jmrLbLjyfbCeP17ns9hSMPTVbNfkqyTRM8+5KnIqftqOq8TL3AaAKlE7PLDKXIbWqS9e7V JT8UPZm98EPPD/lp1c8ruqSZeKHMRTeLWJZr0GBOCrHMHmabbb2V3eAIVD3QOxGG97xQ6q VgeLN3XSRFVKytHBFkvvPhwOFOoCMMBCfQk+uj9C3rtUXEOCD/s1zc0/EytHyizNQHPOQX PzADOI4SIKUOYkd+0oE6tWYpI1EkZyqLVhKyWU1x8wrPfWVjiQlfhpk3Eiz3bIxexwhiGc gMkc+YcDoEJmybb0ydgfvkXwyAxlCJqhQzb3ufAVy0az/r1qrCHpRVLXvt0s7A== 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 4P9Ym22Mg8zk1k; Mon, 6 Feb 2023 17:53:54 +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 316HrsaQ074167; Mon, 6 Feb 2023 17:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316HrsaK074166; Mon, 6 Feb 2023 17:53:54 GMT (envelope-from git) Date: Mon, 6 Feb 2023 17:53:54 GMT Message-Id: <202302061753.316HrsaK074166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 6472761966f7 - main - IfAPI: use IfAPI in mbuf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6472761966f78b364b370d61f452fedde0d19c8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=6472761966f78b364b370d61f452fedde0d19c8c commit 6472761966f78b364b370d61f452fedde0d19c8c Author: Justin Hibbits AuthorDate: 2023-02-01 15:26:20 +0000 Commit: Justin Hibbits CommitDate: 2023-02-06 17:32:04 +0000 IfAPI: use IfAPI in mbuf Sponsored by: Juniper Networks, Inc. --- sys/kern/kern_mbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 84dea05f1bbb..2e1419aaa2ef 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -1642,7 +1642,7 @@ m_rcvif_restore(struct mbuf *m) NET_EPOCH_ASSERT(); ifp = ifnet_byindexgen(m->m_pkthdr.rcvidx, m->m_pkthdr.rcvgen); - if (ifp == NULL || (ifp->if_flags & IFF_DYING)) + if (ifp == NULL || (if_getflags(ifp) & IFF_DYING)) return (NULL); if (__predict_true(m->m_pkthdr.leaf_rcvidx == (u_short)-1)) { @@ -1650,7 +1650,7 @@ m_rcvif_restore(struct mbuf *m) } else { leaf_ifp = ifnet_byindexgen(m->m_pkthdr.leaf_rcvidx, m->m_pkthdr.leaf_rcvgen); - if (__predict_false(leaf_ifp != NULL && (leaf_ifp->if_flags & IFF_DYING))) + if (__predict_false(leaf_ifp != NULL && (if_getflags(leaf_ifp) & IFF_DYING))) leaf_ifp = NULL; }