git: 48d689d6cabe - main - net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update)

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=48d689d6cabe41f9c04e75b774ef5b3e45b94469

commit 48d689d6cabe41f9c04e75b774ef5b3e45b94469
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-01-29 20:59:05 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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);
 }