From nobody Sun Feb 18 21:11:29 2024 X-Original-To: dev-commits-src-branches@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 4TdJJ23Yx4z5BmX3; Sun, 18 Feb 2024 21:11:30 +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 4TdJJ162DFz42qB; Sun, 18 Feb 2024 21:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290689; 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=jF6wR9sCul65m2qFbk9QRWOvNNrlFysVLYADJiP1GNA=; b=Liwu1//dlWhtNStcFfavy3fS+vi2qFPMrZyLIZWqPdnJbIIuupILO+1VKOeLjOofaf5SEI YgqL1lJJ5cmiflW/g6g99jHb8mKF9sFyxnu/3L772asybZljf13/IYV1auuz8izSREIwFu 7TYvIbbSLyQrMO89GSOE28lzsRG5QcRHKL07x5f1RiBYpr2LIT2AiV0+ZoC6aW/xNTtUrn r1XEMDxPXMW2G8XL5gzeK7VzQOg/LFZnYxxnNbufkxIgpjYAWguiXMmg6pKIf7yXc8dpWU 1jK6PgYRf6xkwtSovupTIK7R9JgDkN3vlA3F1pnz5KAW/cL6ZfrcusGDf27q6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290689; 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=jF6wR9sCul65m2qFbk9QRWOvNNrlFysVLYADJiP1GNA=; b=BmnNRUK73qARIqNoDbaqjLudt9zNZtkjreI67ed2kqd44h+zqXklxY5SlDcD1f3wnJjQbz 03p3qgpbQL1M19K+oSNrZ6eyxdObuWM72oqmjhp/2J3HyXbjtn3Ekx59nZk03dCxJzBxmu qccorn6cPCJ0s1eOW4UOvm6qxJlGZ4ULWSHSDW1CbnjB9p/s5GC8gTDZMocV+5ztLZyVvR LbxOd6fDUqoRlOTg4BwJcuaVAIG6x1eqzuoICHFzziz7mW9VXVeVxHfrJ/Br6qxRXvtayn X/X2ed+3upUAoDlyhFsiuueElZWUnt2O03UY3K6k31vWGb67gJqll9LtggsH3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290689; a=rsa-sha256; cv=none; b=AY808xtChPiH18GJKjExZ19N+bSbgk+TmhSwCOhsNsklBsQFy3dZToGuM5nOUnIJMl+yP6 3EX4EgVC4nAvpUk7D4lFGu7kXtn27aKEbHDBs3Hfg+V8J33yn9CZ2FTuajjwlh4GRuWgOk 6rw6alSoJkMrzm9cxfjepUVuIRbyeZVX3boCIQxjM79G/p17pGCzU2g+6IK4y72ZVexR4x SsI1rG6QRNTMEmKrD6Ec8W9JbqrZ3l1TLoagbIiqLRyjtvGnTlugquSKjCkXEMJFBYRy2E ZVFcBE588Aie1F6EEpdjYzhV67coX9eX0LoaZKGcMIj0DR3nijKc2PdRxEhoQw== 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 4TdJJ1585Kz16SD; Sun, 18 Feb 2024 21:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ILBTNe015999; Sun, 18 Feb 2024 21:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBT2q015996; Sun, 18 Feb 2024 21:11:29 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:29 GMT Message-Id: <202402182111.41ILBT2q015996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 56803b9a004b - stable/14 - net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 56803b9a004b6b0d969bbe4bfc947dd18601536e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=56803b9a004b6b0d969bbe4bfc947dd18601536e commit 56803b9a004b6b0d969bbe4bfc947dd18601536e Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 20:59:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:16 +0000 net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update) Both vap_update_preamble() and vap_update_ht_protmode() also check for (*iv_erp_protmode_update)() rather than (*iv_preamble_update)() or (*iv_ht_protmode_update)() before calling the later. Use the appropriate NULL-function-pointer checks before calling it. All seem unused currently so no functional changes expected. Fixes: f1481c8d3b58e Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43655 (cherry picked from commit 48d689d6cabe41f9c04e75b774ef5b3e45b94469) --- sys/net80211/ieee80211_proto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index c0f24344a982..b42ad4e6d14f 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1047,7 +1047,7 @@ vap_update_preamble(void *arg, int npending) IEEE80211_UNLOCK(ic); /* Driver notification */ - if (vap->iv_erp_protmode_update != NULL) + if (vap->iv_preamble_update != NULL) vap->iv_preamble_update(vap); } @@ -1187,7 +1187,7 @@ vap_update_ht_protmode(void *arg, int npending) ic->ic_curhtprotmode); /* Driver update */ - if (vap->iv_erp_protmode_update != NULL) + if (vap->iv_ht_protmode_update != NULL) vap->iv_ht_protmode_update(vap); }