D59707.id186779.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D59707.id186779.diff
View Options

	diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c
	--- a/sys/dev/iwx/if_iwx.c
	+++ b/sys/dev/iwx/if_iwx.c
	@@ -2,7 +2,7 @@
	* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) AND ISC
	*/

	-/* $OpenBSD: if_iwx.c,v 1.183 2024/04/13 23:44:11 jsg Exp $ */
	+/* $OpenBSD: if_iwx.c,v 1.184 2024/05/08 14:03:54 stsp Exp $ */

	/*
	*
	@@ -7831,6 +7831,9 @@
	return err;
	}
	#endif
	+ if (ic->ic_opmode == IEEE80211_M_MONITOR)
	+ return 0;
	+
	err = iwx_power_mac_update_mode(sc, in);
	if (err) {
	printf("%s: could not update MAC power (error %d)\n",
	@@ -7838,9 +7841,6 @@
	return err;
	}

	- if (ic->ic_opmode == IEEE80211_M_MONITOR)
	- return 0;
	-
	err = iwx_rs_init(sc, in);
	if (err) {
	printf("%s: could not init rate scaling (error %d)\n",
	diff --git a/sys/dev/iwx/if_iwxreg.h b/sys/dev/iwx/if_iwxreg.h
	--- a/sys/dev/iwx/if_iwxreg.h
	+++ b/sys/dev/iwx/if_iwxreg.h
	@@ -2,7 +2,7 @@
	* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause
	*/

	-/* $OpenBSD: if_iwxreg.h,v 1.52 2023/10/06 15:15:41 stsp Exp $ */
	+/* $OpenBSD: if_iwxreg.h,v 1.53 2024/05/08 14:03:54 stsp Exp $ */

	/*-
	* Based on BSD-licensed source modules in the Linux iwlwifi driver,
	@@ -1764,7 +1764,7 @@
	#define IWX_DQA_CMD_QUEUE 0
	#define IWX_DQA_AUX_QUEUE 1

	-#define IWX_DQA_INJECT_MONITOR_QUEUE 2 /* used in monitor mode only */
	+#define IWX_DQA_INJECT_MONITOR_QUEUE 1 /* used in monitor mode only */
	#define IWX_DQA_MGMT_QUEUE 1 /* default queue other modes */

	/* Reserve 8 DQA Tx queues for QoS data frames. */