From nobody Wed Feb 14 19:49:22 2024 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 4TZpg70zKmz52h24; Wed, 14 Feb 2024 19:49:23 +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 4TZpg70HGkz4jgv; Wed, 14 Feb 2024 19:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940163; 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=8D7XkGSh/TGKJt+JIRsEoIRCzCK52KZ7tkQWIfkP+ds=; b=bj4iuxpUg/PLjyXL+dknn6aWGznNrIefecH9ifJo7zl71aXugODn6Ng+Tyjn8psZitBXhK +0IAOJcJOwjxHdlrpCQbpwZayiRxvpzYxix94IWBUA6G+Qeyc7p3ADxL6SB0tLH6EHb1wM T/bKcTxGxpvmG3TeDX3/bQh6R3/MvjCJvvSyEF+RZN6GT3tIpxH/uvcyDZ7m/K4Tw88zt2 w9Oi0Cfv3vOKlWsvtPLuDqUDKbonYJN0XNWmDYn9t89d1y8K9QZ29PurTGj1a3TActBFf6 +dkaEAAJY6FJ9QEAcJHZViFevyk/+WLVuGyuZXgPliIWyoDbixNGVP5Oa4NY3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940163; a=rsa-sha256; cv=none; b=nTbSQ0TrH4nrXT7DkDfCXL8NORkhoU85iIoKLXqvw05r3Ak/NPxKCSseAilkMWB9ufqxS0 GKQ+oFnJxNJgNFFgUzxgYPqYKK+CAcqgZGNkSE764hUVWq9/HG+fNscp0aDjTc9jXpn+VY UBM4jQMGUoshk6I9C4SFoD9gpBp3gTC63TfUa27IIvMqpwkT9kWk6cFUUTNmiMHvQg48yf GeAVkhovWGGaBiNlvMyyNvXxHXJxtRdOJBVcIzdjZhuoSyUHIRnCkvXclZZIHMgUP0fgRC /zlevBi6eTGe9kio7azS1Zi/HFma1hRhPMYrmKqnH5HYFe2oOLL22OVzO4gpHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940163; 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=8D7XkGSh/TGKJt+JIRsEoIRCzCK52KZ7tkQWIfkP+ds=; b=mmECEF1wOcnOf056gxGTi6519gG78RkcNO/TjbSZNu0uVKWl53pdCKa49ICTrZqkrPlywr mGTTTHUMeUSV9G0ZXxnNVY91GIxVSznK9hQOIWrk84X/oOb2rW3CxDdAP5FK0QC0tTMghq BDzdNHWrUQYYXdn77gS7VHxdRXssRvPjWBhmmxiO1XwlVMu9GKPReCX3c438LjX/Z2GZ7e FcugxceE6qSBneXuy7wmJoVfBEOwHyIC0tIhIwTI/69Vs8WpWN/uyl4YkDkR5gx8X6tCxr +Q3yYdH7DiVACA3L4Iwi6GzlxDwT1CBzttFAm9GA3LV59hNWYXK+VaVZvUv3NA== 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 4TZpg66RkCz19V8; Wed, 14 Feb 2024 19:49:22 +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 41EJnMsR068415; Wed, 14 Feb 2024 19:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnM7V068412; Wed, 14 Feb 2024 19:49:22 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:22 GMT Message-Id: <202402141949.41EJnM7V068412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 48d689d6cabe - main - net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update) 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48d689d6cabe41f9c04e75b774ef5b3e45b94469 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=48d689d6cabe41f9c04e75b774ef5b3e45b94469 commit 48d689d6cabe41f9c04e75b774ef5b3e45b94469 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 20:59:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:36:29 +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. MFC after: 3 days Fixes: f1481c8d3b58e Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43655 --- 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); }