From nobody Tue Mar 7 14:46: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 4PWJDt4xjlz3wF3F; Tue, 7 Mar 2023 14:46: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 4PWJDt4T1Yz4492; Tue, 7 Mar 2023 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678200414; 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=wm7aNC0Q77agVU8b7u8rZ4NXxPRC7E3JLZKaU84oYkg=; b=LSk83cSB4ilgT6HPKvWVhWaLjFt88XomnLxWxdkocI4Vl1oZYk7RNRXMg5vmOBMah0jak7 D+dxksAnnUPbt4tOg5eW9YEo8xWVaO6ngs5qEkWqzS6Y8vChkdIyuA5AoZAvaoM+Et64Pf 22dAoiV9QSbNZRj0mQJ8RCxZqpQp6Tq8k+tZguAOZ/kZgF5cJYM0SS1SDmaAfgwHyzLdjU R3IgkcGGBEIKaP5No5b3QLqcV2qLJyFo0EwhAV1iPARee8iIZ5GHuGYfA+x6YomgMFmzvP F8+0d6yzFQNDVTa/tmGUUqdvz/6qQcvYjHtA9/vReI0R6A2kyHUVvv1jYqLHYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678200414; 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=wm7aNC0Q77agVU8b7u8rZ4NXxPRC7E3JLZKaU84oYkg=; b=UNlJLheHib6z+2IbGs0i7GObhDG5OWdsJffiIVgAMwkDsOcCwJ05BUASLFUKSdpIXM4mtJ vxQ+GkMV3/l4RlcA4RTp4WhWP6fhD5bmFAB8je5/LjVBlYHVapqwHky7aaKxZkBMPDPxzq 7JvxZgLyENdxFgLM7kC5eeCNosTEBZygQoZ6K28RNrX/unk+NKd63bUXg9VoTVMIaYWN/k 0E9Lv9pmX0lGFHQupaLqz6LmLQ3cuMI3nqdU7qEPQ8o5lBXf6H9v5pLhS6E9rl1/tKrjWj Oofh9BgI5/ce2yIkTfvyHv1Ro8dDRk7+Oi1DOSV5BLgPscrh8Y79NlGLW4m2QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678200414; a=rsa-sha256; cv=none; b=dRjkF0hqNH8H0dfhtUEWfuEpdJf/kbSEDu7oD5PYYy2VG/PZksmuICMTq6ohCWeBamaA24 rCNrgvJmG3yc1rMTm4c3zNT10oWnOVzo+Pagrca5jX26A5NnqTKq1gD5uGOhZhMlXGYODS XPCHvlIvdH8H35ZDumFCo2NPFDSYc8SM+Hv6KKHx9xtf5E3cARPHFAz8fc6ZeD06UgAHKo /Ippk3+EpbmH64wK1bb5+H8KyWji/s5/7ugDnMpKx04BqfBjbBmIOOdW8rJmDCK5WRGpqs iz6+Y48sLWjF3Z8GcN8Z/v21U0uruT3dYtbKJSmdl6P+k27Ff3fOh72YRWMWaQ== 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 4PWJDt3Wt2zncV; Tue, 7 Mar 2023 14:46: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 327Eksh3008770; Tue, 7 Mar 2023 14:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327EksGF008769; Tue, 7 Mar 2023 14:46:54 GMT (envelope-from git) Date: Tue, 7 Mar 2023 14:46:54 GMT Message-Id: <202303071446.327EksGF008769@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: 25c92cd2f6d1 - main - iflib: Further convert to use IfAPI accessors 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: 25c92cd2f6d1421a980fda70bd2b045efab65d8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=25c92cd2f6d1421a980fda70bd2b045efab65d8f commit 25c92cd2f6d1421a980fda70bd2b045efab65d8f Author: Justin Hibbits AuthorDate: 2023-03-06 16:38:05 +0000 Commit: Justin Hibbits CommitDate: 2023-03-07 14:47:00 +0000 iflib: Further convert to use IfAPI accessors Summary: When iflib was first converted some IfAPI APIs were not yet present, so were tagged with "XXX" comments. Finish the conversion by using these new APIs. Reviewed by: gallatin, erj Sponsored by: Juniper Networks, Inc Differential Revision: https://reviews.freebsd.org/D38928 --- sys/net/iflib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 807ada5eb754..aa16e5d5492b 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2890,7 +2890,7 @@ iflib_rxd_pkt_get(iflib_rxq_t rxq, if_rxd_info_t ri) static void iflib_get_ip_forwarding(struct lro_ctrl *lc, bool *v4, bool *v6) { - CURVNET_SET(lc->ifp->if_vnet); /* XXX - DRVAPI */ + CURVNET_SET(if_getvnet(lc->ifp)); #if defined(INET6) *v6 = V_ip6_forwarding; #endif @@ -2980,7 +2980,7 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget) } /* pfil needs the vnet to be set */ - CURVNET_SET_QUIET(ifp->if_vnet); /* XXX - DRVAPI */ + CURVNET_SET_QUIET(if_getvnet(ifp)); for (budget_left = budget; budget_left > 0 && avail > 0;) { if (__predict_false(!CTX_ACTIVE(ctx))) { DBG_COUNTER_INC(rx_ctx_inactive); @@ -4103,7 +4103,7 @@ _task_fn_tx(void *context) goto skip_ifmp; #endif #ifdef ALTQ - if (ALTQ_IS_ENABLED(&ifp->if_snd)) /* XXX - DRVAPI */ + if (if_altq_is_enabled(ifp)) iflib_altq_if_start(ifp); #endif if (txq->ift_db_pending) @@ -4315,7 +4315,7 @@ iflib_if_transmit(if_t ifp, struct mbuf *m) else if (ctx->isc_txq_select) qidx = ctx->isc_txq_select(ctx->ifc_softc, m); /* If not, use iflib's standard method */ - else if ((NTXQSETS(ctx) > 1) && M_HASHTYPE_GET(m) && !ALTQ_IS_ENABLED(&ifp->if_snd)) + else if ((NTXQSETS(ctx) > 1) && M_HASHTYPE_GET(m) && !if_altq_is_enabled(ifp)) qidx = QIDX(ctx, m); /* Set TX queue */ @@ -4420,7 +4420,7 @@ iflib_altq_if_transmit(if_t ifp, struct mbuf *m) { int err; - if (ALTQ_IS_ENABLED(&ifp->if_snd)) { /* XXX - DRVAPI */ + if (if_altq_is_enabled(ifp)) { IFQ_ENQUEUE(&ifp->if_snd, m, err); /* XXX - DRVAPI */ if (err == 0) iflib_altq_if_start(ifp);