Module Name: src
Committed By: mrg
Date: Sat Oct 5 23:27:21 UTC 2019
Modified Files:
src/sys/dev/ic: anvar.h athnvar.h atwvar.h malovar.h mfireg.h nvmereg.h
rt2560var.h rt2661var.h rt2860var.h rtwvar.h wivar.h
src/sys/dev/pci: if_ipwvar.h if_iwmvar.h if_iwnvar.h if_rtwnreg.h
src/sys/dev/usb: if_otusvar.h if_rumvar.h if_runvar.h if_upgtvar.h
if_uralvar.h if_urtwnvar.h if_urtwreg.h if_zydreg.h
src/sys/net80211: ieee80211_radiotap.h
Log Message:
remove __packed attribute from struct ieee80211_radiotap_header
and all the structures that include it.
this should not change anything while avoiding packed vs alignment
warnings from GCC 8, and potentially pessimised code generation
due to the packed marker (there are no misaligned members, just
that the per-device parts may end unaligned.)
all consumers of these members are done from the properly aligned
packet members directly, or, as a union with a 64 byte member,
also properly aligned. codegen didn't appear to change, except
for the definition of sizeof(struct driver_[rt]x_radiotap_header)
in debug info, which is not directly used anywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/anvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/athnvar.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/atwvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/malovar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/nvmereg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/rt2560var.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/rt2661var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/rt2860var.h
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/rtwvar.h
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/ic/wivar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_ipwvar.h \
src/sys/dev/pci/if_iwmvar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/if_iwnvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_rtwnreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_otusvar.h \
src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_rumvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_runvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_upgtvar.h \
src/sys/dev/usb/if_urtwreg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/if_uralvar.h \
src/sys/dev/usb/if_urtwnvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/net80211/ieee80211_radiotap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/anvar.h
diff -u src/sys/dev/ic/anvar.h:1.21 src/sys/dev/ic/anvar.h:1.22
--- src/sys/dev/ic/anvar.h:1.21 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/anvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: anvar.h,v 1.21 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: anvar.h,v 1.22 2019/10/05 23:27:20 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ctr.columbia.edu>. All rights reserved.
@@ -86,7 +86,7 @@ struct an_rx_radiotap_header {
u_int16_t ar_chan_freq;
u_int16_t ar_chan_flags;
int8_t ar_antsignal;
-} __packed;
+};
#define AN_TX_RADIOTAP_PRESENT ((1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
@@ -98,7 +98,7 @@ struct an_tx_radiotap_header {
u_int8_t at_rate;
u_int16_t at_chan_freq;
u_int16_t at_chan_flags;
-} __packed;
+};
#define AN_GAPLEN_MAX 8
Index: src/sys/dev/ic/athnvar.h
diff -u src/sys/dev/ic/athnvar.h:1.7 src/sys/dev/ic/athnvar.h:1.8
--- src/sys/dev/ic/athnvar.h:1.7 Fri Sep 13 07:55:06 2019
+++ src/sys/dev/ic/athnvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: athnvar.h,v 1.7 2019/09/13 07:55:06 msaitoh Exp $ */
+/* $NetBSD: athnvar.h,v 1.8 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: athnvar.h,v 1.34 2013/10/21 16:13:49 stsp Exp $ */
/*-
@@ -75,7 +75,7 @@ struct athn_rx_radiotap_header {
uint16_t wr_chan_flags;
int8_t wr_dbm_antsignal;
uint8_t wr_antenna;
-} __packed;
+};
#define ATHN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_TSFT | \
@@ -91,7 +91,7 @@ struct athn_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define ATHN_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/dev/ic/atwvar.h
diff -u src/sys/dev/ic/atwvar.h:1.39 src/sys/dev/ic/atwvar.h:1.40
--- src/sys/dev/ic/atwvar.h:1.39 Thu Apr 19 21:50:08 2018
+++ src/sys/dev/ic/atwvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atwvar.h,v 1.39 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: atwvar.h,v 1.40 2019/10/05 23:27:20 mrg Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved.
@@ -146,7 +146,7 @@ struct atw_rx_radiotap_header {
uint16_t ar_chan_freq;
uint16_t ar_chan_flags;
uint8_t ar_antsignal;
-} __packed;
+};
#define ATW_TX_RADIOTAP_PRESENT ((1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_CHANNEL))
@@ -157,7 +157,7 @@ struct atw_tx_radiotap_header {
uint8_t at_pad;
uint16_t at_chan_freq;
uint16_t at_chan_flags;
-} __packed;
+};
enum atw_revision {
ATW_REVISION_AB = 0x11, /* ADM8211A */
Index: src/sys/dev/ic/malovar.h
diff -u src/sys/dev/ic/malovar.h:1.3 src/sys/dev/ic/malovar.h:1.4
--- src/sys/dev/ic/malovar.h:1.3 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/malovar.h Sat Oct 5 23:27:20 2019
@@ -59,7 +59,7 @@ struct malo_rx_radiotap_hdr {
uint8_t wr_flags;
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
-} __packed;
+};
#define MALO_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -72,7 +72,7 @@ struct malo_tx_radiotap_hdr {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
struct malo_softc {
device_t sc_dev;
Index: src/sys/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.9 src/sys/dev/ic/mfireg.h:1.10
--- src/sys/dev/ic/mfireg.h:1.9 Sat Nov 24 18:10:29 2018
+++ src/sys/dev/ic/mfireg.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.9 2018/11/24 18:10:29 bouyer Exp $ */
+/* $NetBSD: mfireg.h,v 1.10 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -269,7 +269,7 @@ union mfi_mbox {
uint8_t b[MFI_MBOX_SIZE];
uint16_t s[6];
uint32_t w[3];
-} __packed __aligned(4);
+};
/* mfi completion codes */
typedef enum {
@@ -417,13 +417,13 @@ typedef enum {
/* sense buffer */
struct mfi_sense {
uint8_t mse_data[MFI_SENSE_SIZE];
-} __packed;
+};
/* scatter gather elements */
struct mfi_sg32 {
uint32_t addr;
uint32_t len;
-} __packed;
+};
struct mfi_sg64 {
uint64_t addr;
@@ -434,14 +434,14 @@ struct mfi_sg_ieee {
uint64_t addr;
uint32_t len;
uint32_t flags;
-} __packed;
+};
union mfi_sgl {
struct mfi_sg32 sg32[1];
struct mfi_sg64 sg64[1];
struct mfi_sg_ieee sg_ieee[1];
-} __packed;
+};
/* message frame */
struct mfi_frame_header {
@@ -458,7 +458,7 @@ struct mfi_frame_header {
uint16_t mfh_flags;
uint16_t mfh_timeout;
uint32_t mfh_data_len;
-} __packed;
+};
union mfi_sgl_frame {
struct mfi_sg32 sge32[8];
@@ -514,7 +514,7 @@ struct mfi_dcmd_frame {
uint32_t mdf_opcode;
union mfi_mbox mdf_mbox;
union mfi_sgl mdf_sgl;
-} __packed;
+};
#define MFI_DCMD_MBOX_PEND_FLAG 0x1
struct mfi_abort_frame {
@@ -524,7 +524,7 @@ struct mfi_abort_frame {
uint32_t maf_abort_mfi_addr_lo;
uint32_t maf_abort_mfi_addr_hi;
uint32_t maf_reserved[6];
-} __packed;
+};
struct mfi_smp_frame {
struct mfi_frame_header msf_header;
@@ -562,10 +562,9 @@ union mfi_evt_class_locale {
uint16_t locale;
uint8_t reserved;
int8_t class;
- } __packed mec_members;
-
+ } mec_members;
uint32_t mec_word;
-} __packed;
+};
struct mfi_evt_log_info {
uint32_t mel_newest_seq_num;
@@ -573,30 +572,30 @@ struct mfi_evt_log_info {
uint32_t mel_clear_seq_num;
uint32_t mel_shutdown_seq_num;
uint32_t mel_boot_seq_num;
-} __packed;
+};
struct mfi_progress {
uint16_t mp_progress;
uint16_t mp_elapsed_seconds;
-} __packed;
+};
struct mfi_evtarg_ld {
uint16_t mel_target_id;
uint8_t mel_ld_index;
uint8_t mel_reserved;
-} __packed;
+};
struct mfi_evtarg_pd {
uint16_t mep_device_id;
uint8_t mep_encl_index;
uint8_t mep_slot_number;
-} __packed;
+};
struct mfi_evtarg_pd_state {
struct mfi_evtarg_pd pd;
uint32_t prev_state;
uint32_t new_state;
-} __packed;
+};
struct mfi_evtarg_pd_address {
uint16_t device_id;
@@ -606,22 +605,22 @@ struct mfi_evtarg_pd_address {
struct {
uint8_t encl_index;
uint8_t slot_number;
- } __packed pd_address;
+ } pd_address;
struct {
uint8_t encl_position;
uint8_t encl_connector_index;
- } __packed encl_address;
- } __packed address;
+ } encl_address;
+ } address;
uint8_t scsi_dev_type;
union {
uint8_t port_bitmap;
uint8_t port_numbers;
- } __packed connected;
+ } connected;
uint64_t sas_addr[2];
-} __packed __aligned(8);
+};
struct mfi_evt_detail {
uint32_t med_seq_num;
Index: src/sys/dev/ic/nvmereg.h
diff -u src/sys/dev/ic/nvmereg.h:1.13 src/sys/dev/ic/nvmereg.h:1.14
--- src/sys/dev/ic/nvmereg.h:1.13 Sat Dec 1 18:25:39 2018
+++ src/sys/dev/ic/nvmereg.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmereg.h,v 1.13 2018/12/01 18:25:39 jdolecek Exp $ */
+/* $NetBSD: nvmereg.h,v 1.14 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: nvmereg.h,v 1.10 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -136,7 +136,7 @@ struct nvme_sqe {
union {
uint64_t prp[2];
struct nvme_sge sge;
- } __packed entry;
+ } entry;
uint32_t cdw10;
uint32_t cdw11;
@@ -189,7 +189,7 @@ struct nvme_sqe_io {
union {
uint64_t prp[2];
struct nvme_sge sge;
- } __packed entry;
+ } entry;
uint64_t slba; /* Starting LBA */
Index: src/sys/dev/ic/rt2560var.h
diff -u src/sys/dev/ic/rt2560var.h:1.10 src/sys/dev/ic/rt2560var.h:1.11
--- src/sys/dev/ic/rt2560var.h:1.10 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/rt2560var.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560var.h,v 1.10 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: rt2560var.h,v 1.11 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: rt2560var.h,v 1.2 2006/01/14 12:43:27 damien Exp $ */
/*-
@@ -27,7 +27,7 @@ struct rt2560_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed;
+};
#define RT2560_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -44,7 +44,7 @@ struct rt2560_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_antenna;
-} __packed;
+};
#define RT2560_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/ic/rt2661var.h
diff -u src/sys/dev/ic/rt2661var.h:1.12 src/sys/dev/ic/rt2661var.h:1.13
--- src/sys/dev/ic/rt2661var.h:1.12 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/rt2661var.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661var.h,v 1.12 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: rt2661var.h,v 1.13 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: rt2661var.h,v 1.4 2006/02/25 12:56:47 damien Exp $ */
/*-
@@ -26,7 +26,7 @@ struct rt2661_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_antsignal;
-} __packed;
+};
#define RT2661_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -41,7 +41,7 @@ struct rt2661_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define RT2661_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/ic/rt2860var.h
diff -u src/sys/dev/ic/rt2860var.h:1.5 src/sys/dev/ic/rt2860var.h:1.6
--- src/sys/dev/ic/rt2860var.h:1.5 Tue Jul 25 23:17:20 2017
+++ src/sys/dev/ic/rt2860var.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860var.h,v 1.5 2017/07/25 23:17:20 maya Exp $ */
+/* $NetBSD: rt2860var.h,v 1.6 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: rt2860var.h,v 1.23 2016/03/21 21:16:30 stsp Exp $ */
/*-
@@ -42,7 +42,7 @@ struct rt2860_rx_radiotap_header {
uint8_t wr_dbm_antsignal;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed __aligned(8);
+} __aligned(8);
#define RT2860_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
@@ -59,7 +59,7 @@ struct rt2860_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_hwqueue;
-} __packed __aligned(8);
+} __aligned(8);
#define RT2860_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/dev/ic/rtwvar.h
diff -u src/sys/dev/ic/rtwvar.h:1.47 src/sys/dev/ic/rtwvar.h:1.48
--- src/sys/dev/ic/rtwvar.h:1.47 Thu Apr 19 21:50:08 2018
+++ src/sys/dev/ic/rtwvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.47 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: rtwvar.h,v 1.48 2019/10/05 23:27:20 mrg Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -295,7 +295,7 @@ struct rtw_rx_radiotap_header {
uint8_t p_antsignal;
} u_philips;
} rr_u;
-} __packed;
+};
#define RTW_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_RATE) | \
@@ -308,7 +308,7 @@ struct rtw_tx_radiotap_header {
uint8_t rt_pad;
uint16_t rt_chan_freq;
uint16_t rt_chan_flags;
-} __packed;
+};
enum rtw_attach_state {FINISHED, FINISH_DESCMAP_LOAD, FINISH_DESCMAP_CREATE,
FINISH_DESC_MAP, FINISH_DESC_ALLOC, FINISH_RXMAPS_CREATE,
Index: src/sys/dev/ic/wivar.h
diff -u src/sys/dev/ic/wivar.h:1.66 src/sys/dev/ic/wivar.h:1.67
--- src/sys/dev/ic/wivar.h:1.66 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/wivar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wivar.h,v 1.66 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: wivar.h,v 1.67 2019/10/05 23:27:20 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -52,7 +52,7 @@ struct wi_rx_radiotap_header {
u_int16_t wr_chan_flags;
int8_t wr_antsignal;
int8_t wr_antnoise;
-} __packed;
+};
#define WI_TX_RADIOTAP_PRESENT ((1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
@@ -64,7 +64,7 @@ struct wi_tx_radiotap_header {
u_int8_t wt_rate;
u_int16_t wt_chan_freq;
u_int16_t wt_chan_flags;
-} __packed;
+};
struct wi_rssdesc {
struct ieee80211_rssdesc rd_desc;
Index: src/sys/dev/pci/if_ipwvar.h
diff -u src/sys/dev/pci/if_ipwvar.h:1.18 src/sys/dev/pci/if_ipwvar.h:1.19
--- src/sys/dev/pci/if_ipwvar.h:1.18 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/pci/if_ipwvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipwvar.h,v 1.18 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: if_ipwvar.h,v 1.19 2019/10/05 23:27:20 mrg Exp $ */
/*-
* Copyright (c) 2004
@@ -67,7 +67,7 @@ struct ipw_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_antsignal;
-} __packed;
+};
#define IPW_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_CHANNEL) | \
@@ -77,7 +77,7 @@ struct ipw_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define IPW_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_CHANNEL))
Index: src/sys/dev/pci/if_iwmvar.h
diff -u src/sys/dev/pci/if_iwmvar.h:1.18 src/sys/dev/pci/if_iwmvar.h:1.19
--- src/sys/dev/pci/if_iwmvar.h:1.18 Tue Mar 14 23:59:26 2017
+++ src/sys/dev/pci/if_iwmvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmvar.h,v 1.18 2017/03/14 23:59:26 nonaka Exp $ */
+/* $NetBSD: if_iwmvar.h,v 1.19 2019/10/05 23:27:20 mrg Exp $ */
/* OpenBSD: if_iwmvar.h,v 1.24 2016/09/21 13:53:18 stsp Exp */
/*
@@ -113,7 +113,7 @@ struct iwm_rx_radiotap_header {
uint16_t wr_chan_flags;
int8_t wr_dbm_antsignal;
int8_t wr_dbm_antnoise;
-} __packed;
+};
#define IWM_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -130,7 +130,7 @@ struct iwm_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_hwqueue;
-} __packed;
+};
#define IWM_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/pci/if_iwnvar.h
diff -u src/sys/dev/pci/if_iwnvar.h:1.20 src/sys/dev/pci/if_iwnvar.h:1.21
--- src/sys/dev/pci/if_iwnvar.h:1.20 Wed Jul 19 16:55:12 2017
+++ src/sys/dev/pci/if_iwnvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwnvar.h,v 1.20 2017/07/19 16:55:12 mlelstv Exp $ */
+/* $NetBSD: if_iwnvar.h,v 1.21 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_iwnvar.h,v 1.28 2014/09/09 18:55:08 sthen Exp $ */
/*-
@@ -30,7 +30,7 @@ struct iwn_rx_radiotap_header {
uint16_t wr_chan_flags;
int8_t wr_dbm_antsignal;
int8_t wr_dbm_antnoise;
-} __packed;
+};
#define IWN_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -47,7 +47,7 @@ struct iwn_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_hwqueue;
-} __packed;
+};
#define IWN_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/pci/if_rtwnreg.h
diff -u src/sys/dev/pci/if_rtwnreg.h:1.5 src/sys/dev/pci/if_rtwnreg.h:1.6
--- src/sys/dev/pci/if_rtwnreg.h:1.5 Fri Jun 29 04:02:10 2018
+++ src/sys/dev/pci/if_rtwnreg.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtwnreg.h,v 1.5 2018/06/29 04:02:10 thorpej Exp $ */
+/* $NetBSD: if_rtwnreg.h,v 1.6 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_rtwnreg.h,v 1.3 2015/06/14 08:02:47 stsp Exp $ */
/*-
@@ -76,7 +76,7 @@ struct rtwn_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_dbm_antsignal;
-} __packed;
+};
#define RTWN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
@@ -89,7 +89,7 @@ struct rtwn_tx_radiotap_header {
uint8_t wt_flags;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define RTWN_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/dev/usb/if_otusvar.h
diff -u src/sys/dev/usb/if_otusvar.h:1.9 src/sys/dev/usb/if_otusvar.h:1.10
--- src/sys/dev/usb/if_otusvar.h:1.9 Fri Sep 13 07:55:07 2019
+++ src/sys/dev/usb/if_otusvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otusvar.h,v 1.9 2019/09/13 07:55:07 msaitoh Exp $ */
+/* $NetBSD: if_otusvar.h,v 1.10 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $ */
/*-
@@ -86,7 +86,7 @@ struct otus_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_antsignal;
-} __packed;
+};
#define OTUS_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
@@ -100,7 +100,7 @@ struct otus_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define OTUS_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.9 src/sys/dev/usb/if_zydreg.h:1.10
--- src/sys/dev/usb/if_zydreg.h:1.9 Mon Apr 30 01:14:07 2018
+++ src/sys/dev/usb/if_zydreg.h Sat Oct 5 23:27:20 2019
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.9 2018/04/30 01:14:07 maya Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.10 2019/10/05 23:27:20 mrg Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -1133,7 +1133,7 @@ struct zyd_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_rssi;
-} __packed;
+};
#define ZYD_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -1146,7 +1146,7 @@ struct zyd_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define ZYD_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/usb/if_rumvar.h
diff -u src/sys/dev/usb/if_rumvar.h:1.10 src/sys/dev/usb/if_rumvar.h:1.11
--- src/sys/dev/usb/if_rumvar.h:1.10 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_rumvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rumvar.h,v 1.10 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_rumvar.h,v 1.11 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_rumvar.h,v 1.7 2006/11/13 20:06:38 damien Exp $ */
/*-
@@ -29,7 +29,7 @@ struct rum_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed;
+};
#define RT2573_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -45,7 +45,7 @@ struct rum_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_antenna;
-} __packed;
+};
#define RT2573_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/usb/if_runvar.h
diff -u src/sys/dev/usb/if_runvar.h:1.4 src/sys/dev/usb/if_runvar.h:1.5
--- src/sys/dev/usb/if_runvar.h:1.4 Fri Nov 17 13:08:48 2017
+++ src/sys/dev/usb/if_runvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_runvar.h,v 1.4 2017/11/17 13:08:48 skrll Exp $ */
+/* $NetBSD: if_runvar.h,v 1.5 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_runvar.h,v 1.8 2010/02/08 18:46:47 damien Exp $ */
/*-
@@ -49,7 +49,7 @@ struct run_rx_radiotap_header {
uint8_t wr_dbm_antsignal;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed;
+};
#define RUN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
@@ -66,7 +66,7 @@ struct run_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_hwqueue;
-} __packed;
+};
#define RUN_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/dev/usb/if_upgtvar.h
diff -u src/sys/dev/usb/if_upgtvar.h:1.3 src/sys/dev/usb/if_upgtvar.h:1.4
--- src/sys/dev/usb/if_upgtvar.h:1.3 Sat Sep 14 12:53:24 2019
+++ src/sys/dev/usb/if_upgtvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgtvar.h,v 1.3 2019/09/14 12:53:24 maxv Exp $ */
+/* $NetBSD: if_upgtvar.h,v 1.4 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_upgtvar.h,v 1.15 2009/08/10 20:02:19 deraadt Exp $ */
/*
@@ -29,7 +29,7 @@ struct upgt_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_antsignal;
-} __packed;
+};
#define UPGT_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -43,7 +43,7 @@ struct upgt_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define UPGT_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/usb/if_urtwreg.h
diff -u src/sys/dev/usb/if_urtwreg.h:1.3 src/sys/dev/usb/if_urtwreg.h:1.4
--- src/sys/dev/usb/if_urtwreg.h:1.3 Sat Sep 14 12:40:31 2019
+++ src/sys/dev/usb/if_urtwreg.h Sat Oct 5 23:27:20 2019
@@ -287,7 +287,7 @@ struct urtw_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
int8_t wr_dbm_antsignal;
-} __packed;
+};
#define URTW_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -300,7 +300,7 @@ struct urtw_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define URTW_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/usb/if_uralvar.h
diff -u src/sys/dev/usb/if_uralvar.h:1.13 src/sys/dev/usb/if_uralvar.h:1.14
--- src/sys/dev/usb/if_uralvar.h:1.13 Sat Sep 14 12:42:36 2019
+++ src/sys/dev/usb/if_uralvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralvar.h,v 1.13 2019/09/14 12:42:36 maxv Exp $ */
+/* $NetBSD: if_uralvar.h,v 1.14 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */
/*-
@@ -29,7 +29,7 @@ struct ural_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-} __packed;
+};
#define RAL_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
@@ -45,7 +45,7 @@ struct ural_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_antenna;
-} __packed;
+};
#define RAL_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
Index: src/sys/dev/usb/if_urtwnvar.h
diff -u src/sys/dev/usb/if_urtwnvar.h:1.13 src/sys/dev/usb/if_urtwnvar.h:1.14
--- src/sys/dev/usb/if_urtwnvar.h:1.13 Sat Jun 15 04:00:17 2019
+++ src/sys/dev/usb/if_urtwnvar.h Sat Oct 5 23:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwnvar.h,v 1.13 2019/06/15 04:00:17 msaitoh Exp $ */
+/* $NetBSD: if_urtwnvar.h,v 1.14 2019/10/05 23:27:20 mrg Exp $ */
/* $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $ */
/*-
@@ -44,7 +44,7 @@ struct urtwn_rx_radiotap_header {
uint16_t wr_chan_freq;
uint16_t wr_chan_flags;
uint8_t wr_dbm_antsignal;
-} __packed;
+};
#define URTWN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
@@ -57,7 +57,7 @@ struct urtwn_tx_radiotap_header {
uint8_t wt_flags;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
-} __packed;
+};
#define URTWN_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
Index: src/sys/net80211/ieee80211_radiotap.h
diff -u src/sys/net80211/ieee80211_radiotap.h:1.24 src/sys/net80211/ieee80211_radiotap.h:1.25
--- src/sys/net80211/ieee80211_radiotap.h:1.24 Fri Feb 25 10:45:57 2011
+++ src/sys/net80211/ieee80211_radiotap.h Sat Oct 5 23:27:20 2019
@@ -1,5 +1,5 @@
/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.11 2007/12/13 01:23:40 sam Exp $ */
-/* $NetBSD: ieee80211_radiotap.h,v 1.24 2011/02/25 10:45:57 tron Exp $ */
+/* $NetBSD: ieee80211_radiotap.h,v 1.25 2019/10/05 23:27:20 mrg Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young. All rights reserved.
@@ -78,7 +78,7 @@ struct ieee80211_radiotap_header {
* Additional extensions are made
* by setting bit 31.
*/
-} __packed __aligned(8);
+} __aligned(8);
/*
* Name Data type Units
