From nobody Mon Feb 19 08:07:58 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 4TdZsV4nhBz5B30G; Mon, 19 Feb 2024 08:07:58 +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 4TdZsV3VGrz4KQf; Mon, 19 Feb 2024 08:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330078; 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=psf47EmRH+caLnIg4lZ6Qamlf46bbumqvwn3RHFlU6I=; b=PChzDH7ycp+ngrB67gxeydhC0R6szXNqo0zU3KUQmDJgNyWDZOZe/VuwogrjMvqz85n4VO svJcWEbpjJN11zZ5fyUXz09hn6QXIURaIze+MAP89BqpPtrj0mtUhrBhS2xM8K8JwVpWeK 3/En6Dflh9Ra/wBThrXa7ILxZYChT/YWkYcTkVIGb7ZTwtLtpRbOeS+sQDxNuODpiNHMs5 oUH7BvG+ZoVk1KfgmfioWYF1v62i9BRn3D8Fm6qh4kesPsxk4GXyIlvti3VtKQCIXcnJCP KqMzxJ4NU7kMAlaojAKjIzKzcfK3k+/UavuIeYLYEFgBK5JEn6Lgdj+/HSgcxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330078; 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=psf47EmRH+caLnIg4lZ6Qamlf46bbumqvwn3RHFlU6I=; b=Gqnpf+b3dkj+UOuJ7I+UsXGToyyDa6FAE99rhjsdApMV9jT1JiMcsjPmorSaX/ZdBK6xF/ zzPckAYdtM98Pjj7LrxtFvhTs0GA6ZfMGIUYqP420U4RvN3J2FOAKauu4dsQgfH+rxk+9x InpRI5hEidpJUQUGd2XfNrHqOJWLpZaOUgAhBPp106sYaYywKkilOjMdl79oQTzQzfAFss ilhPYklKdui+xYIAfCw3oz40z0KJBArc/YP/IRaL7WNjhoE7mZ61Plz+WfMML2am0VU70q LBy/GrNpsuSF3A5JqUZjrI7k2hhXHNILm+KPsIZrIHR2AyWD4JEvRKvueWkCdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330078; a=rsa-sha256; cv=none; b=cvioQmult/jIXpNsrL1uiP3e63tldrlEn3tXPnlgiQlD2qZbJdC53cfpoA6W5oinDxBJQD V3qlnuDZ9PyHVAgvHl9rQKGUU7SVQOa/IQbS/utBXeeOk8OukUCwEFxbXIsGoQA5jizV8X eKVpNIQE7N7U02oGSGRNIxGsg9vyOG3bIyi4Vb52yt+9gQP3EIBQNqcMufHb62jpfOB4Gs sC1yy98XfRU/ez1A/H4uP7KNTs0IY6Qay35ft259UnVQmoMsbESSGR9ZFCBQIgl19+vs40 NGDsIbFLB4P+wCDkqp8p5FfVQWUPVbTHcE5FST50IP6BrEEaTZV4fmxGetNVYA== 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 4TdZsV2bLJzRDn; Mon, 19 Feb 2024 08:07:58 +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 41J87wuu016242; Mon, 19 Feb 2024 08:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87wDr016239; Mon, 19 Feb 2024 08:07:58 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:58 GMT Message-Id: <202402190807.41J87wDr016239@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: 5427cefd1d03 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 5427cefd1d03e428a0148a6f65a39c280fa38374 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5427cefd1d03e428a0148a6f65a39c280fa38374 commit 5427cefd1d03e428a0148a6f65a39c280fa38374 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 20:59:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:01 +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 5ed9f2e3f50e..d00b7de0ab31 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1051,7 +1051,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); } @@ -1191,7 +1191,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); }