From nobody Mon Feb 06 20:24:27 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 4P9d5l3C11z3n887; Mon, 6 Feb 2023 20:24:27 +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 4P9d5l2k8wz3w1W; Mon, 6 Feb 2023 20:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675715067; 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=5pc+91M8znKwtlr/r1Z4mJjT+z74AxElept2p+u4J0M=; b=O7ofw32F/lAOd1Bu2z/Z/tKFlrlpwBv3l6PIg0wh6RldzKYhd2wJIdNijNNQ2niO3k4kqe zjCY2wJSSK4PBQuPw0EqqwvfQKSDKWzh+k0LqGBIpl/V08xfzytdND5qCEaCg52TiBJk7k cyXQ4kWG0ou6ICsgiz3WWo6vgc8CoygKoikmjsskSTlXv0/EWZAu7hDfF9WBXEcFK+llJV eMakMZ3s+rvJhCijSOVAATEaWmQ6gqgBjTJfVqG7Fcsz/mHWUeR/ZzKu8urEQG7rMBD0Zd kqTEhhiBeKfKjm6Fltd9HdvQvqKIWxUrI7mATRo3mfCcp98p5O264ywlvul/lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675715067; 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=5pc+91M8znKwtlr/r1Z4mJjT+z74AxElept2p+u4J0M=; b=w5ir+Pd8Nu5ScKmcyEnxbexhygj2JfKPz4Rh/ZYADexBIfvYvzmS4fKD1evPwMf86MA0yL zp+OwVQfoZ39Q0Be5lie5Ydhlq5AMNdKKQTtiXG3OTllrzNGiZIGSEdjjUWwmIUMEkLbMe LooLUCCs78iMT/wOveQCFLSukpdXw+qyU3JWWuZr58j4Qp9+pBz+4P8mUcn6UY/eVfh/Me lKA/0pKD0ZXT3O1T0uzo+VzIwsBGtChg8vPK+QNaEby8feWJm7STl2eDtlLRg0g5ZN/EFK uU4urxNxQMNTT9GdXKZiXjD86Cw+iXaiA6XYNZ91B8A1VK/0nosYUub2yPcWMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675715067; a=rsa-sha256; cv=none; b=DSDUZLzC6AeD9eBt94zIs9nlBWKWRVrWEFQ3WppaJFirp4V326H84cr1U/KsymKm0shrrG mPRM6RtddZWY1yX2t/mvv3KstF6Me1cr+gtCtB62IlR04uqFYW83LaUXv9YgAXKaU2nsnd faRy650ZsCyrTnBKsT3coN0fmxK5va0OZnpeBpJnWzeV4HXMxruN2stpeP0UAmX1WUXliv 6nGhCLFB347Y2IpBxUqWwAEg38yZxe/u6QXou4vev1ZcnaQMt0k9i0XOakV7SxJp/x8S11 I6NLrIW/dmer1Pe1w/3toI2yuZxCAuT2UA6b1XC+zC3wRa31Dp21eX3ewun6AA== 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 4P9d5l1ZRczpQb; Mon, 6 Feb 2023 20:24:27 +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 316KORPW091613; Mon, 6 Feb 2023 20:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316KOR15091612; Mon, 6 Feb 2023 20:24:27 GMT (envelope-from git) Date: Mon, 6 Feb 2023 20:24:27 GMT Message-Id: <202302062024.316KOR15091612@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: d8b78838c5f0 - main - tsec(4): Fix the build from IfAPI conversion 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: d8b78838c5f0c81c158658e1e2f6f4ca26a8f6f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=d8b78838c5f0c81c158658e1e2f6f4ca26a8f6f7 commit d8b78838c5f0c81c158658e1e2f6f4ca26a8f6f7 Author: Justin Hibbits AuthorDate: 2023-02-06 20:21:34 +0000 Commit: Justin Hibbits CommitDate: 2023-02-06 20:23:52 +0000 tsec(4): Fix the build from IfAPI conversion Fixes: 47842ecfe Sponsored by: Juniper Networks, Inc. --- sys/dev/tsec/if_tsec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c index 7680ef43b775..25dc25f57152 100644 --- a/sys/dev/tsec/if_tsec.c +++ b/sys/dev/tsec/if_tsec.c @@ -294,7 +294,7 @@ tsec_detach(struct tsec_softc *sc) if (sc->tsec_ifp != NULL) { #ifdef DEVICE_POLLING - if (sc->tsec_if_getcapenable(ifp) & IFCAP_POLLING) + if (if_getcapenable(sc->tsec_ifp) & IFCAP_POLLING) ether_poll_deregister(sc->tsec_ifp); #endif @@ -1414,7 +1414,7 @@ tsec_receive_intr(void *arg) TSEC_RECEIVE_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->tsec_if_getcapenable(ifp) & IFCAP_POLLING) { + if (if_getcapenable(sc->tsec_ifp) & IFCAP_POLLING) { TSEC_RECEIVE_UNLOCK(sc); return; } @@ -1495,7 +1495,7 @@ tsec_transmit_intr(void *arg) TSEC_TRANSMIT_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->tsec_if_getcapenable(ifp) & IFCAP_POLLING) { + if (if_getcapenable(sc->tsec_ifp) & IFCAP_POLLING) { TSEC_TRANSMIT_UNLOCK(sc); return; }