summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_iwxreg.h
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2023-02-14 12:14:08 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2023-02-14 12:14:08 +0000
commita9fb324b47c17ca8dc672b0436459d289ffa35c3 (patch)
treee281e60f907723639abceb2e95e9dea8425198c6 /sys/dev/pci/if_iwxreg.h
parentcde326790f74fac62a3e47a884d609eb5c700f57 (diff)
jca@ points out that the field I split in iwx(4) Rx descriptors is in a union.
Keep semantics of the field intact by wrapping the split values in struct { }. Again no size change, because of union semantics. diff from jca@ with request to commit if ok, thanks! build-tested again + ok tb@
Diffstat (limited to 'sys/dev/pci/if_iwxreg.h')
-rw-r--r--sys/dev/pci/if_iwxreg.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/pci/if_iwxreg.h b/sys/dev/pci/if_iwxreg.h
index 29dc5cbe965..3b9cbde8fc5 100644
--- a/sys/dev/pci/if_iwxreg.h
+++ b/sys/dev/pci/if_iwxreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwxreg.h,v 1.40 2023/02/13 15:50:06 stsp Exp $ */
+/* $OpenBSD: if_iwxreg.h,v 1.41 2023/02/14 12:14:07 stsp Exp $ */
/*-
* Based on BSD-licensed source modules in the Linux iwlwifi driver,
@@ -3628,8 +3628,10 @@ struct iwx_rx_mpdu_desc_v3 {
* TSF value on air rise (INA), only valid if
* IWX_RX_MPDU_PHY_TSF_OVERLOAD isn't set
*/
- uint32_t tsf_on_air_rise0;
- uint32_t tsf_on_air_rise1;
+ struct {
+ uint32_t tsf_on_air_rise0;
+ uint32_t tsf_on_air_rise1;
+ };
struct {
uint32_t phy_data0;
@@ -3658,8 +3660,10 @@ struct iwx_rx_mpdu_desc_v1 {
uint8_t mac_context;
uint32_t gp2_on_air_rise;
union {
- uint32_t tsf_on_air_rise0;
- uint32_t tsf_on_air_rise1;
+ struct {
+ uint32_t tsf_on_air_rise0;
+ uint32_t tsf_on_air_rise1;
+ };
struct {
uint32_t phy_data0;
uint32_t phy_data1;