From nobody Mon Dec 13 13:50:36 2021 X-Original-To: dev-commits-src-all@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 2F11218D183C; Mon, 13 Dec 2021 13:50:37 +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 4JCNF84Bqwz3CNp; Mon, 13 Dec 2021 13:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 559DF15AB1; Mon, 13 Dec 2021 13:50:36 +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 1BDDoaMQ036916; Mon, 13 Dec 2021 13:50:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDDoata036915; Mon, 13 Dec 2021 13:50:36 GMT (envelope-from git) Date: Mon, 13 Dec 2021 13:50:36 GMT Message-Id: <202112131350.1BDDoata036915@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: ef6a011da523 - stable/12 - pfsync: check IFF_DRV_RUNNING in the correct field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: ef6a011da523da7ba3075b01ac77d730244a7a0d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639403436; 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=J+shwLDTtPi4BqHDO31Bpd4WezBHEmQqTcEGvZCRCqc=; b=RDNBdfcVNvp+0zqQCWsd44ZX85c7fR8vmeqU4AMnp0GupIDpijTR48B4sZvRbq4oYUvEiU 2h2dUtN0Srj6GsAjrf07SBNYKyI6SZY2Yy0AVfeOoAVgBcNLStp1iXQvlxhllJWMkMlnRI yY46uc03h8C47r9WpUAuRECrLDxBECnfTZrqDlQe12jCt0Do1DK9wsJyjojIW7M+W9qi9Y NST0i5jubLlf8DEl0aedViu44YHS8Ou1GZ3NV2b50BFEjyLhFb5712r+meVNaW3ZLsbMwo QCH1IRfhDAGy25xDCFgrn05460vUMltaSuo+uTguLnKQNYg0yGSObzzf/4xyqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639403436; a=rsa-sha256; cv=none; b=YHqbG9im57g6qA6xmc4Ax0LI/BCeMiMVrxsrMfTEmS4PeXTOtZmNIvAuhHLxWJbcjeTmMS 6sNe9vv+HwtZDtYeOoNbxW2rrFnlpdZgSap/Y4deeXF3L5IiewJPsH0zn9B569j4/mopqz Oz8wL654UC1dWZHhuPmslKgmJhjnCSIxVSHVVaqza8U2+y1x7JYMIkSYOHd++JO7eqaZK8 NG8TUAPio7qH9aaePJXRyHblhrZ+h78vfetIeEFr2mmBaVBXr+6JmWVaGQm2y6thi4Tzne 3SWIkSvboDGxTrMqMvN8spCWSCiU35e5OvVQg6LKQpVX93aoZBTKDNFd+QdiCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef6a011da523da7ba3075b01ac77d730244a7a0d commit ef6a011da523da7ba3075b01ac77d730244a7a0d Author: Kristof Provost AuthorDate: 2021-12-02 13:36:12 +0000 Commit: Kristof Provost CommitDate: 2021-12-13 08:54:15 +0000 pfsync: check IFF_DRV_RUNNING in the correct field This flag is stored in if_drv_flags, not if_flags. Reviewed by: glebius MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33241 (cherry picked from commit 7b02a551f78ed5c4bd55d3b33da55524cd2317a6) --- sys/netpfil/pf/if_pfsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index d6016766ddcc..301d963abd9c 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1746,7 +1746,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) PFSYNC_LOCK(sc); - if (!(sc->sc_ifp->if_flags & IFF_DRV_RUNNING) || + if (!(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) || !(sc->sc_flags & PFSYNCF_DEFER)) { PFSYNC_UNLOCK(sc); return (0);