From nobody Wed Jun 4 03:44:17 2025 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 4bBtjt4rPdz5xN8g; Wed, 04 Jun 2025 03:44:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBtjt16jwz3JNH; Wed, 04 Jun 2025 03:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749008658; 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=oaqO7GoRVnG7wkJJAt63922C5okMnQuo9oYSCDMDn8M=; b=Xc88XiZVtSrWtwWq6vAKQYy0yu2rVwuDStkP9Ry9ajsCSep9m0O+/ywAV1JlKJVRwkUxlQ rthr9Yg3gwLLRhLvUua7iM2cdiODpAOlDiR0zNJsZmljGQwkvgtUYxvFSqLHL0rdE9JEYm 8mkmQcJjO4iJU25E3T4JEZ7mnvfWWD8MR21y+PEBcnT63UI788ol2CV3f358SqueJZjWH6 88531kS764azXnguY9DfpSA08A3cP9PYnkqTj14hGArUikcH9ZOyl+m0a+aXe62DDXnsbY 0Aa/xN4GfdkyA8/x7jfesgfjl0VREe50aKvFYGGNTWUopKKnmQzrCH5Q/uvOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749008658; 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=oaqO7GoRVnG7wkJJAt63922C5okMnQuo9oYSCDMDn8M=; b=NhLpj9mBOVbxsBn6+tafGN3a4FAY35gcSxym2D0Bu72mt2iG23CJkBolVR+cm+4IpnStil seFtI5s2LysoqdaXFI9JsIicRyGo4ip87qPCrOJYPkofDI5UEtHjK98RlilvnXMTE//S3U pkIjmLyfIO7ueN6kNFi19+w+fmkO83XYhggxr0Qm5rax7WPmpsWAt4LI6btjG3t2PFl3S8 52YCCBT24kLjw6oBXpi1dtQSwIWsx5tvSBCjnmPlVFFd5qSjwHEGpe1iuoVT8SyA/N+rnK giEn3qmTLe+xAaLFt2hxxGhmWmoRimdE2zMlxPKCJtoklFoAv//Tf3Qa1A5aMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749008658; a=rsa-sha256; cv=none; b=TjqZ8IJZL4j8VkAmTQc69hcdMxPxEmxiDzFqWM45FPJz3+XFWxPRdH9illciQ0ZwSjcG36 VGCSifdslLujsfELwkFrdJ0VeVYXTaukZ4GLdT2eThEf1MSuLRuZiErTRlff/uv1x4xYU/ dwpQYGoc8cfGooWQXBzmVqt7BNy7p13WKATXVmaItkRtUNvI3KfvOT+DlDEA54HJFlz5Bg CHKecJyV6w3ow+Zn11CbR+eTm2EJnZDHJsXU9UwUvRGjRtkO0SmyFrYieDF5+JZ+sfN7Jk F+qPVgMjtwPWxHocAo5bPOW+UumBq3uHnGsqcmWhO6ejTd8vsPt4+wn9ToS+Qw== 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 4bBtjt0YGLz161Q; Wed, 04 Jun 2025 03:44:18 +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 5543iHEU031162; Wed, 4 Jun 2025 03:44:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5543iHDJ031159; Wed, 4 Jun 2025 03:44:17 GMT (envelope-from git) Date: Wed, 4 Jun 2025 03:44:17 GMT Message-Id: <202506040344.5543iHDJ031159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 2a1beace07f1 - main - net80211: convert ieee80211_mesh.c to not require if_private.h 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a1beace07f150ee4839a6bcf949479986e61861 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=2a1beace07f150ee4839a6bcf949479986e61861 commit 2a1beace07f150ee4839a6bcf949479986e61861 Author: Adrian Chadd AuthorDate: 2025-06-02 02:20:02 +0000 Commit: Adrian Chadd CommitDate: 2025-06-04 03:35:00 +0000 net80211: convert ieee80211_mesh.c to not require if_private.h Convert the couple of uses of ifnet structure bits into ifnet calls and remove the header. Differential Revision: https://reviews.freebsd.org/D50645 Reviewed by: bz --- sys/net80211/ieee80211_mesh.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c index 4a9cd5e66a97..3f0410a69e3c 100644 --- a/sys/net80211/ieee80211_mesh.c +++ b/sys/net80211/ieee80211_mesh.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -3302,11 +3301,11 @@ mesh_airtime_calc(struct ieee80211_node *ni) /* Time to transmit a frame */ rate = ieee80211_node_get_txrate_dot11rate(ni); overhead = ieee80211_compute_duration(ic->ic_rt, - ifp->if_mtu + IEEE80211_MESH_MAXOVERHEAD, rate, 0) << M_BITS; + if_getmtu(ifp) + IEEE80211_MESH_MAXOVERHEAD, rate, 0) << M_BITS; /* Error rate in percentage */ /* XXX assuming small failures are ok */ - errrate = (((ifp->if_get_counter(ifp, IFCOUNTER_OERRORS) + - ifp->if_get_counter(ifp, IFCOUNTER_IERRORS)) / 100) << M_BITS) + errrate = (((if_getcounter(ifp, IFCOUNTER_OERRORS) + + if_getcounter(ifp, IFCOUNTER_IERRORS)) / 100) << M_BITS) / 100; res = (overhead + (nbits / rate)) * ((1 << S_FACTOR) / ((1 << M_BITS) - errrate));