From nobody Mon Dec 06 12:25:45 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 A21B618CA4E1; Mon, 6 Dec 2021 12:25:46 +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 4J72hV1Kymz3GNl; Mon, 6 Dec 2021 12:25:46 +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 09F083AF6; Mon, 6 Dec 2021 12:25:46 +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 1B6CPjni048134; Mon, 6 Dec 2021 12:25:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6CPjmu048133; Mon, 6 Dec 2021 12:25:45 GMT (envelope-from git) Date: Mon, 6 Dec 2021 12:25:45 GMT Message-Id: <202112061225.1B6CPjmu048133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7b02a551f78e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7b02a551f78ed5c4bd55d3b33da55524cd2317a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638793546; 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=/ViubDUJEMUaXHYc49oMJF3qgaT5Lw5vFzRJiR+zxpg=; b=bX7Ntnr9br6aywQbr2xBj1l4MtnyYQpLQdY+wDFJ/+lseDEL0nKlm3klS1AoUYh30fI6DJ sUrA4TXkfg5Ra4zCL7K7sY04mQqAI47/oH4oJqGbZqLtdSgcR+yVC34028CSUGMO9nCp2t Ub2MjYdyzv1rYGPvlioeycUg9KjaqYye2yVPwZuKKubAtr4gxVQ50nhC8D+UyAcozmdXdM L219yAx+Y9UxfOqNBQxb2WykcGLsB6D4kwDq1Ge7P0JQ0ER1Nm//5Nb3CW+DgRKBFUE9Hj e/ueVq6g09+B8g/XXIxYtBHREP62LiBYh1edNHaiqoWfbZBECs0z2FiU6qW0Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638793546; a=rsa-sha256; cv=none; b=cOIFW5QqBVJq+dvad+78csnXiIBJqU+eCOGJSKT52IAOuQpA8REJsZg7IXEQQ/ZOe8ODXu LG0OvGOa4z4x5wlq9q8F+DnVY4TbMCYfRw0vsXaHl2v7FBjuxRkKTIajSHR3bLaF3Yydkw I8/S7XfAEf5GoEkd6ZKDblFxrQX9/GhmEdgvkr/zwTmn3YrAUEfDluscj6WgNT46XXROTU cvRjW8vanwQbRJE0qSEQBb/BisrWDjy3F7kH+aRFX3pn0R2th/ZllyScHGH0Mi/oT6FMq1 TSTxMSLCXlJsMG3RXfyuwjBURb4l75TiQCGDIm3evuWXub0AeLqUMqc8Nvt0bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b02a551f78ed5c4bd55d3b33da55524cd2317a6 commit 7b02a551f78ed5c4bd55d3b33da55524cd2317a6 Author: Kristof Provost AuthorDate: 2021-12-02 13:36:12 +0000 Commit: Kristof Provost CommitDate: 2021-12-06 12:25:14 +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 --- 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 166ac428fd9b..a991c7ce5c7f 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1744,7 +1744,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);