From nobody Fri Oct 16 04:17:03 2026 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 4j5WqM56VLz6vrBp for ; Fri, 16 Oct 2026 04:17:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j5WqM1wcdz4vwb for ; Fri, 16 Oct 2026 04:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792124223; 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=8V+V1AXLtBLi1J7oZrXF+QyPXjrYH7xJoq5LAJNZjlA=; b=Nc0JXlmjA7/JcDkVgIjp6pURC9di0G22MJ4ot/IZ/iB1fLkgBTIhf/nmiFUWzT1Qr7qpv6 7+K5BKDD4+m0gPCs5iQ/Iq+l3iVF8hNAycqh/1HZcE9FgavWJ+c+vZaQaR1xqgdH1CsaQ6 Cg+vot/kO0UmauT501DJGg4PLgOBcw9WBF7jnFldvalml8UP89QZA6OfDF/7vfFrpXepuv wQZDc2zp2u7rCHeM5Gd7bAUOs/SWams7rtd0pIEJoWoMMgqh8HqUlZLYu5HaEAdOatIdm9 fB5P/R0yQ+zA/3NATm08t8qkm2o9XQ2reksngNoXGTUHO+fQhzEvTRy1OfayvA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792124223; b=C8srFnFatODbG+stOQs86bNxnjR5R02m51U0HasThfpSWzR1mjiMItuAcONj3EslnQ4fXZ o+fKmy6kw7uIvS8WtgqDp59vJQOef75cGJBYl3gYMQjLMpxlD6VqKqyLS5zp9Gte2Fk2SN lY7L1HhVAFc/ilPZjaOMtW8Kqmi+l1c47+E73KcdrT+hdMg63dUxW8SCVBFPPFOQhb6NPL iAWz7qTX2FdKZZxGVRMQyTv+InOETwMx2gS8x3nwfZJ3k/GT931iyFNB9/ai8spMukeLi5 o0DfdMk6Yg+OTIGAy2whLs1anKP4DfCXkb3E/kbHZr4bgCtje5AEiKMQo+24+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792124223; 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=8V+V1AXLtBLi1J7oZrXF+QyPXjrYH7xJoq5LAJNZjlA=; b=HYtO8WKa6G1UJUDBukqFB/AZNjVpDbWTVD1p6+Eo8GUMRdrvMooeiY8xzcxOy8+uLg7q6t msGa9cIRjA5oGNJ8HOw0CU6Vj181ssvarhe+d4jEDoTRicAjLk0t5UJuz/gTwCcQgr8CAv BmEZDhp9K1I8Z8h/286Dfe90yQMD5hmIehZsbaxtEA3pSBVqXlnz8t4CEh/pVY4urT4cIe fQjjlZjbNXinu6LAjpPMQiIYtwGVO1A9xowNIfkNXNj3OL3aC2mloeYpxsyIsD8Z4lhAC1 8diUxqg4y5jXAJKbtbSbqSigjk90ZRf8tg/MwIneMdCk2KjlIws61PdIA/XR2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j5WqM0LDJz13RD for ; Fri, 16 Oct 2026 04:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b290 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Oct 2026 04:17:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: a7195567fdad - main - iwm: rename iwm_stop_session_protection() -> iwm_unprotect_session() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a7195567fdadb929cfddd190a9666a75ed7652d4 Auto-Submitted: auto-generated Date: Fri, 16 Oct 2026 04:17:03 +0000 Message-Id: <6ad1a53f.3b290.6cc1749c@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a7195567fdadb929cfddd190a9666a75ed7652d4 commit a7195567fdadb929cfddd190a9666a75ed7652d4 Author: Adrian Chadd AuthorDate: 2026-10-16 04:16:32 +0000 Commit: Adrian Chadd CommitDate: 2026-10-16 04:16:54 +0000 iwm: rename iwm_stop_session_protection() -> iwm_unprotect_session() This matches OpenBSD's driver naming. Obtained from: OpenBSD a6e25c727a2214219715b51ba6af2221d7e0d674 Reviewed by: mizhka Differential Revision: https://reviews.freebsd.org/D60287 --- sys/dev/iwm/if_iwm.c | 2 +- sys/dev/iwm/if_iwm_time_event.c | 2 +- sys/dev/iwm/if_iwm_time_event.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 5d911475b6e1..083c316e118e 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -4764,7 +4764,7 @@ iwm_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) (nstate == IEEE80211_S_INIT || nstate == IEEE80211_S_SCAN || nstate == IEEE80211_S_AUTH)) { - iwm_stop_session_protection(sc, ivp); + iwm_unprotect_session(sc, ivp); } if ((vap->iv_state == IEEE80211_S_RUN || diff --git a/sys/dev/iwm/if_iwm_time_event.c b/sys/dev/iwm/if_iwm_time_event.c index df149bad13bd..9cc708233cb9 100644 --- a/sys/dev/iwm/if_iwm_time_event.c +++ b/sys/dev/iwm/if_iwm_time_event.c @@ -406,7 +406,7 @@ iwm_protect_session(struct iwm_softc *sc, struct iwm_vap *ivp, } void -iwm_stop_session_protection(struct iwm_softc *sc, struct iwm_vap *ivp) +iwm_unprotect_session(struct iwm_softc *sc, struct iwm_vap *ivp) { struct iwm_time_event_cmd time_cmd = {}; diff --git a/sys/dev/iwm/if_iwm_time_event.h b/sys/dev/iwm/if_iwm_time_event.h index 6b28a03f2600..f48fad6bd8af 100644 --- a/sys/dev/iwm/if_iwm_time_event.h +++ b/sys/dev/iwm/if_iwm_time_event.h @@ -110,7 +110,6 @@ extern void iwm_rx_time_event_notif(struct iwm_softc *sc, struct iwm_rx_packet *pkt); extern void iwm_protect_session(struct iwm_softc *sc, struct iwm_vap *ivp, uint32_t duration, uint32_t max_delay, boolean_t wait_for_notif); -extern void iwm_stop_session_protection(struct iwm_softc *sc, - struct iwm_vap *ivp); +extern void iwm_unprotect_session(struct iwm_softc *sc, struct iwm_vap *ivp); #endif /* __IF_IWM_TIME_EVENT_H__ */