D60287.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60287.id.diff
View Options

	diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c
	--- a/sys/dev/iwm/if_iwm.c
	+++ b/sys/dev/iwm/if_iwm.c
	@@ -4653,7 +4653,7 @@
	(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.h b/sys/dev/iwm/if_iwm_time_event.h
	--- a/sys/dev/iwm/if_iwm_time_event.h
	+++ b/sys/dev/iwm/if_iwm_time_event.h
	@@ -110,7 +110,6 @@
	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__ */
	diff --git a/sys/dev/iwm/if_iwm_time_event.c b/sys/dev/iwm/if_iwm_time_event.c
	--- a/sys/dev/iwm/if_iwm_time_event.c
	+++ b/sys/dev/iwm/if_iwm_time_event.c
	@@ -406,7 +406,7 @@
	}

	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 = {};