From nobody Tue Jan 31 20:03:24 2023 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 4P5wwD2twCz3c8hy; Tue, 31 Jan 2023 20:03:24 +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 4P5wwD28HHz3D7L; Tue, 31 Jan 2023 20:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675195404; 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=Hnng0jJQPbQUy/KhPay0gmBOUnW9wPuNiiQFLi4s7/8=; b=eFeWRnjnmiOPvVGX1XqIAvseeGXEzZIH29b+j8YAlI0ey/E5plCzVG0HELT45/6U9TyGUM DlgPS81UnnjgAmyogKKDqoqJ89Le0TgTFOogrZz1m+pMN99GxtH+leawLTaaO2/sfaNjgs UvIJ7eSC5M8A0TqGnn7+lPhHBEWuIUYkl/V90qXa5+PaHOFgWcbpuvJ9oUDFMfWcHxJ5pF oCu/gZiy0Rp6/RAuxm5YimXxe1dVaGc0GKz0WLRGw1BHubvyTcldAoWc2oZDRkjNCnIYhv crnloxAIEWt2ODFLZ6+pHyTMEjPSH0B/a6EnfeV02s4st3ZvbgTOyiR/WzkPBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675195404; 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=Hnng0jJQPbQUy/KhPay0gmBOUnW9wPuNiiQFLi4s7/8=; b=uOqKg/Kno9rVKoqoRjRWwS6xt7t4JsszBolOnXbkReWml53kOQ1box1K1QibA4djbkdXWZ MWNfZnpFOwHsvmGo3sf0g4k6HZ3rPP0wzvunmT29pHS+XR0ymKqfdstTL1UaD5CxA8Pj09 cD982iiBc+l6in+Y5u0sFUB2BUtZnzPWSOtze+ozcVSUvjKVzoMs0RP2XKL27Snba2up0i 262x2FMUKBU5WDY9pcy1SR9H+PNnTkIQQqLY/SG0o1rDgrpwW5cMWFeVU3r7Mr5ON18dcb PcpfL4ZQ9TzuTVdhS54HA8LHhi4uzbNp33AiunPAtT5A94GuWQHo+aGEw6dPXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675195404; a=rsa-sha256; cv=none; b=rXbBUY4rM4xYcSOVO+4lKpcujqkrl331RkMvpCWpxOsVv/Uz/KaFFgRn/SjdWNDOegV9k5 9TaTPH4GqCfSIhEp1M2bARMTSf3WvplurRK1VcOTOEhHHy3vEmjDjjqzObJVV4SdFUztI9 s5Dgi+R6s0aGJGFFDjijycOt3sNz6SF/8BMlinPxone0JUwrPiCIoZVKrGExL+DPTfc/xr wa6fCCxLNYoF0bfYhfNH949YsRqN5MUpnyjRwBDKl92HCx+4IakNJd1309kx68KpDm0JD9 swlhnS60f0Gi/IQ1w1NFN3gKaGy5/5QIqUIK72sJNlkKJctl8qGk/dF/AucVMw== 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 4P5wwD0sqCz11sl; Tue, 31 Jan 2023 20:03:24 +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 30VK3OFF025101; Tue, 31 Jan 2023 20:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VK3OuW025100; Tue, 31 Jan 2023 20:03:24 GMT (envelope-from git) Date: Tue, 31 Jan 2023 20:03:24 GMT Message-Id: <202301312003.30VK3OuW025100@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: 56c1eafe50e1 - main - IfAPI: Finish conversion of bnxt(4) to IfAPI. 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56c1eafe50e19e31cc30c3aa7fa90fc9f246e289 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=56c1eafe50e19e31cc30c3aa7fa90fc9f246e289 commit 56c1eafe50e19e31cc30c3aa7fa90fc9f246e289 Author: Justin Hibbits AuthorDate: 2023-01-23 15:07:58 +0000 Commit: Justin Hibbits CommitDate: 2023-01-31 20:02:18 +0000 IfAPI: Finish conversion of bnxt(4) to IfAPI. Sponsored by: Juniper Networks, Inc. --- sys/dev/bnxt/bnxt_sysctl.c | 4 ++-- sys/dev/bnxt/if_bnxt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/bnxt/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_sysctl.c index 677dc2c1c0c1..1ed2502623d2 100644 --- a/sys/dev/bnxt/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_sysctl.c @@ -1227,8 +1227,8 @@ bnxt_create_config_sysctls_pre(struct bnxt_softc *softc) SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "vlan_strip", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, softc, 0, bnxt_vlan_strip_sysctl, "I", "strip VLAN tag in the RX path"); - SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "if_name", CTLFLAG_RD, - iflib_get_ifp(softc->ctx)->if_xname, 0, "interface name"); + SYSCTL_ADD_CONST_STRING(ctx, children, OID_AUTO, "if_name", CTLFLAG_RD, + if_name(iflib_get_ifp(softc->ctx)), "interface name"); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "intr_coal_rx_usecs", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, softc, 0, diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 6f45c0963d1d..54140b8c0010 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -1213,7 +1213,7 @@ struct bnxt_softc *bnxt_find_dev(uint32_t domain, uint32_t bus, uint32_t dev_fn, SLIST_FOREACH(sc, &pf_list, next) { /* get the softc reference based on device name */ - if (dev_name && !strncmp(dev_name, iflib_get_ifp(sc->softc->ctx)->if_xname, BNXT_MAX_STR)) { + if (dev_name && !strncmp(dev_name, if_name(iflib_get_ifp(sc->softc->ctx)), BNXT_MAX_STR)) { return sc->softc; } /* get the softc reference based on domain,bus,device,function */