From nobody Tue Nov 12 16:03:09 2024 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 4XnrmY5Lzfz5ckVw; Tue, 12 Nov 2024 16:03:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnrmY3Zpfz4YDj; Tue, 12 Nov 2024 16:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731427389; 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=XpiUy/6UggbkAuIDSWbvcQsJgHE2hc2xlJbbYcenpw0=; b=Cs12Ii5jMn9bOGz0WXbUEexHX7yz+pSkq/0Kkxws0IvDOgZjXAoc1d/XY7qJ2CUbp6YXXd iPYoXkaUaWHgVjB7vnllA6YBFVNEXZFuOjPmZH2Q7YloVM6RCm+gBkVmoy5HNdakB2y+Fi Q1sTM/Xh43hXPJJ68gQf6NiN6ueVC+fFRuyIbUzjuvb8crVRpcL8RzhFWanalh59f6btDp /K87BMNj4IxSdWK233F0VKHZ914YVSHvMeOYOx9q6T/4Pa41Em3n6OBmdOngkpMDBthvLN LfXZSopgtqS3sS2aBnQ1t+Zl9IyCp8fAvAzNe1Y1/Zl3IexAYnk1UOJqxJB3xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731427389; 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=XpiUy/6UggbkAuIDSWbvcQsJgHE2hc2xlJbbYcenpw0=; b=w9ge/mtXbLVmg797PtLm9MwPVJIo8aOmSk9LceNsHFLJquXo/EgUsAMAZNDJ51uqAqb2z9 LoAr6sZPQNoPUcIlgv/stXbiwo0w/fwp+PieQTQAZTMp4d3LzpgXRCW16RLkitmOLKtC/X U7zKM5GmtBrJPA9W0zIg1KY11SzYX8tCTqddeEyIoUi7A7G6k4dZsHsbToCuhGAvBWuUZ5 cO4ivw7f8l+5hZuLaLom1zAo0/BX31KSMCvvaG48AU7zG5EBUQ/ReVZlojvWjn2e2JlvXJ IcTz1LmDy+2tPWC4FEfpCkNqYOAU3E8EyvGQF+UBxhalgbxPF/gA0apVTRvI3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731427389; a=rsa-sha256; cv=none; b=mFS2BF9dncUqlj0CkWIg+ArwhN13qj91gJk9fRxOtulsArJ5AUGh17bLbXRWJpRoTg7XFU aGgy7VWXY0GSOf9YBqK4I0muAKCw+IkonODFj9QH/oPpoojaIZH0k39K9uswkSgJOB3HXX WSIJBC3eO46nAw67VV5jvp7sg81ddFwdSNqSiXS4vUt6I28bBigRFo7pyCURejTp2aWwPs IQCU6DFFDUQ/yqeIIdvOJJ4EeWkiLcUtA1oqXlnA5aEocqWiytmVt52cFBOZCuGO13o3R+ AQqykm/KMyjr02veup1rPz+jbJYp1pQH1sDQkIRVvuVX88S82izcDQzC5qJZ9A== 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 4XnrmY34DyzHJQ; Tue, 12 Nov 2024 16:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ACG390U084284; Tue, 12 Nov 2024 16:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ACG39Pj084281; Tue, 12 Nov 2024 16:03:09 GMT (envelope-from git) Date: Tue, 12 Nov 2024 16:03:09 GMT Message-Id: <202411121603.4ACG39Pj084281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: fc32b5ddf3af - main - ipfilter: Remove dead code 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc32b5ddf3af503b41e81df8f1dc4f6a0aace25b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fc32b5ddf3af503b41e81df8f1dc4f6a0aace25b commit fc32b5ddf3af503b41e81df8f1dc4f6a0aace25b Author: Cy Schubert AuthorDate: 2024-11-12 15:58:03 +0000 Commit: Cy Schubert CommitDate: 2024-11-12 16:00:46 +0000 ipfilter: Remove dead code ea3022cbbd3f5 converted timeout(9) to callout(9). This code remained as an artifact of the conversion. Fixes: ea3022cbbd3f5 MFC after: 1 week --- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index b3dea40c3d8c..23514907f86e 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -178,9 +178,6 @@ ipf_timer_func(void *arg) ipf_slowtimer(softc); if (softc->ipf_running == -1 || softc->ipf_running == 1) { -#if 0 - softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2); -#endif callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,